Charts · Navigation · Forms: band names widen a sideways chart's gutter; Pagination takes a size, speaks the locale and jumps to a typed page
- A horizontal chart's gutter grows to its widest band name, floored at the theme gutter and capped at half the chart; a name past the cap ends in an ellipsis (#10). - Pagination's previous and next tooltips read i18n (English and zh-CN built in, app catalogs override); `.size(ControlSize)` sizes every control, Sm by default; `.jump()` adds a Go to field (#11). - NumberInput keys the owner's value as shown: a draft survives a blur, a value set while focused lands when focus leaves, and an echo of its own commit is no new value. A ranged field holds room for its widest bound through `Input::least`.
This commit is contained in:
1 parent
2ce336895c
commit
bd3772ad54
17 files changed
+438
-51
No files matched your search
+71
-18
@@ -7,7 +7,8 @@ use gpui::{
|
||||
|
||||
use crate::{
|
||||
buttons::{Button, ButtonVariant, IconButton},
|
||||
forms::Run,
|
||||
forms::{NumberInput, Run},
|
||||
i18n,
|
||||
primitives::IconName,
|
||||
theme::{ActiveTheme, ControlSize, TextSize},
|
||||
typography::format::{self, Separators},
|
||||
@@ -49,6 +50,8 @@ pub struct Pagination {
|
||||
page: usize,
|
||||
pages: usize,
|
||||
near: usize,
|
||||
size: ControlSize,
|
||||
jump: bool,
|
||||
on_change: Option<OnPage>,
|
||||
}
|
||||
|
||||
@@ -60,10 +63,23 @@ impl Pagination {
|
||||
page,
|
||||
pages,
|
||||
near: 1,
|
||||
size: ControlSize::Sm,
|
||||
jump: false,
|
||||
on_change: None,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn size(mut self, size: ControlSize) -> Self {
|
||||
self.size = size;
|
||||
self
|
||||
}
|
||||
|
||||
/// A field after Next that goes to the page typed.
|
||||
pub fn jump(mut self) -> Self {
|
||||
self.jump = true;
|
||||
self
|
||||
}
|
||||
|
||||
/// Pages shown on each side of the current one.
|
||||
pub fn near(mut self, near: usize) -> Self {
|
||||
self.near = near;
|
||||
@@ -89,16 +105,43 @@ impl RenderOnce for Pagination {
|
||||
}
|
||||
})
|
||||
};
|
||||
let subtle = cx.theme().colors.fg_subtle;
|
||||
let (back, ahead) = (go.clone(), go.clone());
|
||||
let theme = cx.theme();
|
||||
let (size, subtle, small) = (
|
||||
self.size,
|
||||
theme.colors.fg_subtle,
|
||||
theme.text_size(TextSize::Sm),
|
||||
);
|
||||
let (back, ahead, jump) = (go.clone(), go.clone(), go.clone());
|
||||
let to = i18n::text(cx, "pagination.jump", &[]);
|
||||
let jump = self.jump.then(|| {
|
||||
let words = div()
|
||||
.whitespace_nowrap()
|
||||
.text_size(small)
|
||||
.text_color(subtle)
|
||||
.child(to.clone());
|
||||
div().flex().items_center().gap_2().child(words).child(
|
||||
div().flex_none().child(
|
||||
NumberInput::new((self.id.clone(), "jump"), page as f64)
|
||||
.label(to)
|
||||
.range(1.0, pages as f64)
|
||||
.precision(0)
|
||||
.size(size)
|
||||
.on_commit(move |to, window, cx| {
|
||||
if to as usize != page {
|
||||
jump(to as usize, window, cx);
|
||||
}
|
||||
}),
|
||||
),
|
||||
)
|
||||
});
|
||||
let cells = list
|
||||
.into_iter()
|
||||
.enumerate()
|
||||
.map(move |(ix, entry)| match entry {
|
||||
Some(number) => {
|
||||
let go = go.clone();
|
||||
Button::new(("page", number), number.to_string())
|
||||
.size(ControlSize::Sm)
|
||||
let button = Button::new(("page", number), number.to_string())
|
||||
.size(size)
|
||||
.variant(if number == page {
|
||||
ButtonVariant::Secondary
|
||||
} else {
|
||||
@@ -108,7 +151,10 @@ impl RenderOnce for Pagination {
|
||||
if number != page {
|
||||
go(number, window, cx);
|
||||
}
|
||||
})
|
||||
});
|
||||
div()
|
||||
.debug_selector(move || format!("pagination-page-{number}"))
|
||||
.child(button)
|
||||
.into_any_element()
|
||||
}
|
||||
None => div()
|
||||
@@ -120,26 +166,33 @@ impl RenderOnce for Pagination {
|
||||
});
|
||||
div()
|
||||
.id(self.id)
|
||||
.debug_selector(|| "pagination-root".into())
|
||||
.flex()
|
||||
.flex_wrap()
|
||||
.items_center()
|
||||
.gap_1()
|
||||
.child(
|
||||
IconButton::new("previous", IconName::ChevronLeft)
|
||||
.size(ControlSize::Sm)
|
||||
.variant(ButtonVariant::Ghost)
|
||||
.tooltip("Previous page")
|
||||
.disabled(page == 1)
|
||||
.on_click(move |_, window, cx| back(page - 1, window, cx)),
|
||||
div().debug_selector(|| "pagination-previous".into()).child(
|
||||
IconButton::new("previous", IconName::ChevronLeft)
|
||||
.size(size)
|
||||
.variant(ButtonVariant::Ghost)
|
||||
.tooltip(i18n::text(cx, "pagination.previous", &[]))
|
||||
.disabled(page == 1)
|
||||
.on_click(move |_, window, cx| back(page - 1, window, cx)),
|
||||
),
|
||||
)
|
||||
.children(cells)
|
||||
.child(
|
||||
IconButton::new("next", IconName::ChevronRight)
|
||||
.size(ControlSize::Sm)
|
||||
.variant(ButtonVariant::Ghost)
|
||||
.tooltip("Next page")
|
||||
.disabled(page == pages)
|
||||
.on_click(move |_, window, cx| ahead(page + 1, window, cx)),
|
||||
div().debug_selector(|| "pagination-next".into()).child(
|
||||
IconButton::new("next", IconName::ChevronRight)
|
||||
.size(size)
|
||||
.variant(ButtonVariant::Ghost)
|
||||
.tooltip(i18n::text(cx, "pagination.next", &[]))
|
||||
.disabled(page == pages)
|
||||
.on_click(move |_, window, cx| ahead(page + 1, window, cx)),
|
||||
),
|
||||
)
|
||||
.children(jump)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user