Skip to content
Merged
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 @@ -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",
Expand Down Expand Up @@ -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 = []
Expand Down
2 changes: 0 additions & 2 deletions app/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2535,8 +2535,6 @@ pub fn enabled_features() -> HashSet<FeatureFlag> {
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")]
Expand Down
4 changes: 1 addition & 3 deletions app/src/server/telemetry/events.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 6 additions & 10 deletions app/src/terminal/view.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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| {
Expand Down
6 changes: 0 additions & 6 deletions crates/warp_features/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading