Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions app/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,6 @@ default = [
"open_code_notifications",
"cli_agent_rich_input",
"vertical_tabs",
"vertical_tabs_summary_mode",
"tab_configs",
"grouped_tabs",
"pinned_tabs",
Expand Down Expand Up @@ -1006,7 +1005,6 @@ inline_menu_headers = []
directory_tab_colors = []
hoa_code_review = []
vertical_tabs = []
vertical_tabs_summary_mode = []
tab_configs = []
grouped_tabs = []
pinned_tabs = []
Expand Down
2 changes: 0 additions & 2 deletions app/src/features.rs
Original file line number Diff line number Diff line change
Expand Up @@ -453,8 +453,6 @@ fn enabled_features() -> HashSet<FeatureFlag> {
FeatureFlag::HoaCodeReview,
#[cfg(feature = "vertical_tabs")]
FeatureFlag::VerticalTabs,
#[cfg(feature = "vertical_tabs_summary_mode")]
FeatureFlag::VerticalTabsSummaryMode,
#[cfg(feature = "tab_configs")]
FeatureFlag::TabConfigs,
#[cfg(feature = "grouped_tabs")]
Expand Down
35 changes: 11 additions & 24 deletions app/src/workspace/view/vertical_tabs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -994,13 +994,7 @@ fn resolve_vertical_tabs_mode(app: &AppContext) -> VerticalTabsResolvedMode {
VerticalTabsDisplayGranularity::Tabs => match *settings.vertical_tabs_tab_item_mode.value()
{
VerticalTabsTabItemMode::FocusedSession => VerticalTabsResolvedMode::FocusedSession,
VerticalTabsTabItemMode::Summary => {
if FeatureFlag::VerticalTabsSummaryMode.is_enabled() {
VerticalTabsResolvedMode::Summary
} else {
VerticalTabsResolvedMode::FocusedSession
}
}
VerticalTabsTabItemMode::Summary => VerticalTabsResolvedMode::Summary,
},
}
}
Expand Down Expand Up @@ -5801,8 +5795,7 @@ pub(super) fn render_settings_popup(
let show_details_on_hover = *TabSettings::as_ref(app)
.vertical_tabs_show_details_on_hover
.value();
let show_tab_item_section = matches!(current_granularity, VerticalTabsDisplayGranularity::Tabs)
&& FeatureFlag::VerticalTabsSummaryMode.is_enabled();
let show_tab_item_section = matches!(current_granularity, VerticalTabsDisplayGranularity::Tabs);
let show_focused_session_controls = !matches!(
resolve_vertical_tabs_mode(app),
VerticalTabsResolvedMode::Summary
Expand Down Expand Up @@ -5892,18 +5885,14 @@ pub(super) fn render_settings_popup(
theme,
);

let summary_option = if FeatureFlag::VerticalTabsSummaryMode.is_enabled() {
Some(render_tab_item_mode_option(
"Summary",
matches!(current_tab_item_mode, VerticalTabsTabItemMode::Summary),
state.summary_option_mouse_state.clone(),
VerticalTabsTabItemMode::Summary,
appearance,
theme,
))
} else {
None
};
let summary_option = render_tab_item_mode_option(
"Summary",
matches!(current_tab_item_mode, VerticalTabsTabItemMode::Summary),
state.summary_option_mouse_state.clone(),
VerticalTabsTabItemMode::Summary,
appearance,
theme,
);

let density_header = Container::new(
Text::new_inline(
Expand Down Expand Up @@ -6035,9 +6024,7 @@ pub(super) fn render_settings_popup(
popup_col.add_child(make_divider(theme));
popup_col.add_child(tab_item_header);
popup_col.add_child(focused_session_option);
if let Some(summary_option) = summary_option {
popup_col.add_child(summary_option);
}
popup_col.add_child(summary_option);
}

if show_focused_session_controls {
Expand Down
4 changes: 0 additions & 4 deletions crates/warp_features/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -845,10 +845,6 @@ pub enum FeatureFlag {
/// Redux of the setup/initial user query UI for cloud mode.
CloudModeSetupV2,

/// Enables summary mode in vertical tabs, showing condensed tab summaries
/// instead of individual pane rows.
VerticalTabsSummaryMode,

CloudModeInputV2,

/// Enables continuing cloud mode conversations in the cloud after an execution ends.
Expand Down
Loading