Skip to content

Fix New worktree config clipping in tab config menu #10542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SagarSDagdu wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −11
Open

Fix New worktree config clipping in tab config menu #10542

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions app/src/workspace/view.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,10 +250,7 @@ use crate::drive::{
CloudObjectTypeAndId, DriveObjectType, DrivePanel, DrivePanelEvent, OpenWarpDriveObjectSettings,
};
use crate::experiments::{BlockOnboarding, Experiment};
use crate::menu::{
Event as MenuEvent, Menu, MenuItem, MenuItemFields, MenuSelectionSource,
DEFAULT_WIDTH as MENU_DEFAULT_WIDTH,
};
use crate::menu::{Event as MenuEvent, Menu, MenuItem, MenuItemFields, MenuSelectionSource};
use crate::modal::{Modal, ModalEvent, ModalViewState};
use crate::network::{NetworkStatus, NetworkStatusEvent};
use crate::notebooks::manager::{NotebookManager, NotebookSource};
Expand Down Expand Up @@ -6243,18 +6240,16 @@ impl Workspace {
fn open_tab_configs_menu(
&mut self,
position: Vector2F,
is_vertical_tabs: bool,
_is_vertical_tabs: bool,
open_source: TabConfigsMenuOpenSource,
ctx: &mut ViewContext<Self>,
) {
let menu_items = self.unified_new_session_menu_items(ctx);
ctx.update_view(&self.new_session_dropdown_menu, |context_menu, view_ctx| {
if is_vertical_tabs {
// Match the Figma mock width (OptionMenuItem component is 268px).
context_menu.set_width(268.);
} else {
context_menu.set_width(MENU_DEFAULT_WIDTH);
}
// Match the Figma mock width (OptionMenuItem component is 268px).
// Both the chevron and vertical-tab `+` variants share the same items,
// and the default 186px is too narrow for "New worktree config".
context_menu.set_width(268.);
context_menu.set_items(menu_items, view_ctx);
match open_source {
TabConfigsMenuOpenSource::KeyboardShortcut => {
Expand Down