Skip to content

Fix diff footer overflow on narrow panes #11237

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

Draft
moirahuang wants to merge 1 commit into
base: master
Choose a base branch
from
+91 −40
Draft

Fix diff footer overflow on narrow panes #11237

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
131 changes: 91 additions & 40 deletions app/src/code/editor/nav_bar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use warp_editor::model::CoreEditorModel;
use warpui::{
elements::{
Align, Border, ConstrainedBox, Container, CrossAxisAlignment, Flex, MouseStateHandle,
ParentElement, Shrinkable,
ParentElement, Shrinkable, SizeConstraintCondition, SizeConstraintSwitch,
},
presenter::ChildView,
ui_components::{
Expand All @@ -31,6 +31,7 @@ const NAV_BAR_HEIGHT: f32 = 40.;
const NAV_BAR_ICON_SIZE: f32 = 16.;
const NAV_BAR_ICON_PADDING: f32 = 4.;
const NAV_BAR_SEPARATOR_PADDING: f32 = 12.;
const NAV_BAR_COMPACT_WIDTH_THRESHOLD: f32 = 300.;

// The ratio of rows to offset of when jumping to a diff nav (base is the total number of lines in viewport)
const DIFF_NAV_OFFSET_PIXEL_RATIO: usize = 10;
Expand Down Expand Up @@ -65,6 +66,8 @@ pub struct NavBar {
mouse_state_handles: MouseStateHandles,
up_label_button: ViewHandle<ActionButton>,
down_label_button: ViewHandle<ActionButton>,
up_icon_button: ViewHandle<ActionButton>,
down_icon_button: ViewHandle<ActionButton>,
}

impl NavBar {
Expand All @@ -88,13 +91,30 @@ impl NavBar {
.with_icon(Icon::ArrowDown)
.on_click(|ctx| ctx.dispatch_typed_action(NavBarAction::NavigateDown))
});
let up_icon_button = ctx.add_typed_action_view(|_| {
ActionButton::new("", NakedTheme)
.with_size(ButtonSize::InlineActionHeader)
.with_icon(Icon::ArrowUp)
.with_tooltip("Previous")
.on_click(|ctx| ctx.dispatch_typed_action(NavBarAction::NavigateUp))
});

let down_icon_button = ctx.add_typed_action_view(|_| {
ActionButton::new("", NakedTheme)
.with_size(ButtonSize::InlineActionHeader)
.with_icon(Icon::ArrowDown)
.with_tooltip("Next")
.on_click(|ctx| ctx.dispatch_typed_action(NavBarAction::NavigateDown))
});

Self {
model,
behavior: NavBarBehavior::Closable,
mouse_state_handles: Default::default(),
up_label_button,
down_label_button,
up_icon_button,
down_icon_button,
}
}

Expand Down Expand Up @@ -148,6 +168,7 @@ impl NavBar {
appearance: &Appearance,
background: Fill,
total: usize,
is_compact: bool,
app: &AppContext,
) -> Box<dyn Element> {
let diff_text = appearance
Expand Down Expand Up @@ -181,16 +202,16 @@ impl NavBar {
.with_border(Border::new(1.).with_border_fill(appearance.theme().surface_2()))
.finish();

let mut content = Flex::row().with_cross_axis_alignment(CrossAxisAlignment::Center);
if !is_compact {
content.add_child(diff_text);
}
content.add_child(index);

Align::new(
Container::new(
Flex::row()
.with_cross_axis_alignment(CrossAxisAlignment::Center)
.with_child(diff_text)
.with_child(index)
.finish(),
)
.with_padding_right(16.)
.finish(),
Container::new(content.finish())
.with_padding_right(if is_compact { 8. } else { 16. })
.finish(),
)
.right()
.finish()
Expand Down Expand Up @@ -230,18 +251,64 @@ impl NavBar {
.finish()
}

fn render_nav_label(&self, up: bool) -> Box<dyn Element> {
fn render_nav_label(&self, up: bool, is_compact: bool) -> Box<dyn Element> {
let button_handle = if up {
&self.up_label_button
if is_compact {
&self.up_icon_button
} else {
&self.up_label_button
}
} else if is_compact {
&self.down_icon_button
} else {
&self.down_label_button
};

Container::new(Align::new(ChildView::new(button_handle).finish()).finish())
.with_padding_right(16.)
.with_padding_right(if is_compact { 8. } else { 16. })
.finish()
}

fn render_nav_bar_content(
&self,
appearance: &Appearance,
total: usize,
editable: bool,
is_compact: bool,
app: &AppContext,
) -> Box<dyn Element> {
let mut row = Flex::row()
.with_cross_axis_alignment(CrossAxisAlignment::Center)
.with_child(
Shrinkable::new(
1.,
self.render_match_index(
appearance,
appearance.theme().background(),
total,
is_compact,
app,
),
)
.finish(),
)
.with_child(self.render_nav_label(true, is_compact))
.with_child(self.render_nav_label(false, is_compact));

// Do not render the revert button if there is nothing to revert or the editor is
// not in an editable interaction state. Hide it in the compact layout to keep the
// navigation controls inside narrow panes.
if !is_compact && editable && total > 0 {
row.add_child(self.render_revert_button(appearance));
}

if !is_compact && matches!(self.behavior, NavBarBehavior::Closable) {
row.add_child(self.render_close_button(appearance));
}

row.finish()
}

pub fn navigate_up(&mut self, ctx: &mut ViewContext<Self>) {
self.model.update(ctx, |model, ctx| {
model.nav_diff_up(ctx);
Expand Down Expand Up @@ -277,35 +344,19 @@ impl View for NavBar {
InteractionState::Editable
);

let mut row = Flex::row()
.with_cross_axis_alignment(CrossAxisAlignment::Center)
.with_child(
Shrinkable::new(
1.,
self.render_match_index(
appearance,
appearance.theme().background(),
total,
app,
),
)
.finish(),
)
.with_child(self.render_nav_label(true))
.with_child(self.render_nav_label(false));

// Do not render the revert button if there is nothing to revert or the editor is
// not in an editable interaction state.
if editable && total > 0 {
row.add_child(self.render_revert_button(appearance));
}

if matches!(self.behavior, NavBarBehavior::Closable) {
row.add_child(self.render_close_button(appearance));
}
let default_content = self.render_nav_bar_content(appearance, total, editable, false, app);
let compact_content = self.render_nav_bar_content(appearance, total, editable, true, app);
let content = SizeConstraintSwitch::new(
default_content,
[(
SizeConstraintCondition::WidthLessThan(NAV_BAR_COMPACT_WIDTH_THRESHOLD),
compact_content,
)],
)
.finish();

Container::new(
ConstrainedBox::new(row.finish())
ConstrainedBox::new(content)
.with_height(NAV_BAR_HEIGHT)
.finish(),
)
Expand Down