diff --git a/app/Cargo.toml b/app/Cargo.toml index f444732fe6..1bea651b8f 100644 --- a/app/Cargo.toml +++ b/app/Cargo.toml @@ -470,7 +470,6 @@ default = [ "settings_import", "shared_with_me", "block_toolbelt_save_as_workflow", - "remove_alt_screen_padding", "less_horizontal_terminal_padding", "session_sharing_acls", "external_agent_mode_context", @@ -794,7 +793,6 @@ block_toolbelt_save_as_workflow = [] blocklist_markdown_table_rendering = [] blocklist_markdown_images = [] minimalist_ui = [] -remove_alt_screen_padding = [] loginless_conversion = [] external_agent_mode_context = [] avatar_in_tab_bar = [] diff --git a/app/src/lib.rs b/app/src/lib.rs index 0ef51bd673..9fa0f439d0 100644 --- a/app/src/lib.rs +++ b/app/src/lib.rs @@ -2535,8 +2535,6 @@ pub fn enabled_features() -> HashSet { FeatureFlag::FullScreenZenMode, #[cfg(feature = "minimalist_ui")] FeatureFlag::MinimalistUI, - #[cfg(feature = "remove_alt_screen_padding")] - FeatureFlag::RemoveAltScreenPadding, #[cfg(feature = "avatar_in_tab_bar")] FeatureFlag::AvatarInTabBar, #[cfg(feature = "workflow_aliases")] diff --git a/app/src/server/telemetry/events.rs b/app/src/server/telemetry/events.rs index 0b7314c9bd..12a9221bd4 100644 --- a/app/src/server/telemetry/events.rs +++ b/app/src/server/telemetry/events.rs @@ -5478,9 +5478,7 @@ impl TelemetryEventDesc for TelemetryEventDiscriminants { Self::ToggleWorkspaceDecorationVisibility => { EnablementState::Flag(FeatureFlag::FullScreenZenMode) } - Self::UpdateAltScreenPaddingMode => { - EnablementState::Flag(FeatureFlag::RemoveAltScreenPadding) - } + Self::UpdateAltScreenPaddingMode => EnablementState::Always, Self::AddTabWithShell => EnablementState::Flag(FeatureFlag::ShellSelector), Self::AgentModeSurfacedCitations | Self::AgentModeOpenedCitation => { EnablementState::Always diff --git a/app/src/terminal/view.rs b/app/src/terminal/view.rs index 8e0b67f776..337621c079 100644 --- a/app/src/terminal/view.rs +++ b/app/src/terminal/view.rs @@ -11382,14 +11382,11 @@ impl TerminalView { .block_list() .active_block() .top_level_command(self.sessions.as_ref(ctx)); - if FeatureFlag::RemoveAltScreenPadding.is_enabled() - // If we don't know what the top-level command is, - // we should still perform the redundant resize. - && active_command.is_none_or(|cmd| { - !ALT_SCREEN_APPS_THAT_MUST_MATCH_BLOCKLIST_PADDING - .contains(cmd.as_str()) - }) - { + // If we don't know what the top-level command is, + // we should still perform the redundant resize. + if active_command.is_none_or(|cmd| { + !ALT_SCREEN_APPS_THAT_MUST_MATCH_BLOCKLIST_PADDING.contains(cmd.as_str()) + }) { // Since the alt-screen and blocklist have different sizes, // let's make sure to refresh the winsize when switching // back and forth between these modes. @@ -27100,8 +27097,7 @@ pub fn create_size_info( match *TerminalSettings::as_ref(ctx).alt_screen_padding { AltScreenPaddingMode::Custom { uniform_padding } - if FeatureFlag::RemoveAltScreenPadding.is_enabled() - && model.is_alt_screen_active() + if model.is_alt_screen_active() // If we don't know what the top-level command is, // it's not denylisted so we use the custom padding. && active_command.is_none_or(|cmd| { diff --git a/crates/warp_features/src/lib.rs b/crates/warp_features/src/lib.rs index 1322e725a8..b5f677e468 100644 --- a/crates/warp_features/src/lib.rs +++ b/crates/warp_features/src/lib.rs @@ -165,12 +165,6 @@ pub enum FeatureFlag { /// https://github.com/warpdotdev/session-sharing-server/blob/b6590ebd0b0e7f6847d6b2228b4e77d63939ce22/server/Cargo.toml#L13 SessionSharingAcls, - /// Removes the extraneous padding from the alt-screen that we previously had - /// to keep consistent size between blocklist and alt-screen. - /// - /// See plan here: https://docs.google.com/document/d/1TBPSWNfh4KylkEgL5o5xyYgK_KQzUQk1oxjuIx2ipXw - RemoveAltScreenPadding, - /// Enables the full-screen "zen mode" setting, where we hide the tab bar if there's only one /// tab. FullScreenZenMode,