leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(segmented_button): invalid tab offset when width is reduced by nav bar

Browse source
This commit is contained in:
Michael Aaron Murphy 2024-03-08 14:15:12 +01:00 • committed by Michael Murphy
parent 2ccd3682b4
commit 26a7e6b0f9
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/widget/segmented_button/horizontal.rs
View file

@ -119,11 +119,12 @@ where
let spacing = f32::from(self.spacing); let spacing = f32::from(self.spacing);
let size; let size;
let mut reduce_button_offset = false;
if state.known_length != num { if state.known_length != num {
if state.known_length > num { if state.known_length > num {
state.buttons_offset -= state.buttons_offset.min(state.known_length - num); state.buttons_offset -= state.buttons_offset.min(state.known_length - num);
} else { } else {
state.buttons_offset += num - state.known_length; reduce_button_offset = true;
} }
state.known_length = num; state.known_length = num;
@ -203,6 +204,8 @@ where
if !state.collapsed { if !state.collapsed {
state.buttons_offset = 0; state.buttons_offset = 0;
} else if reduce_button_offset {
state.buttons_offset = num - state.buttons_visible;
} }
size size

2
src/widget/tab_bar.rs
View file

@ -25,6 +25,8 @@ where
let space_xs = theme.cosmic().space_xs(); let space_xs = theme.cosmic().space_xs();
segmented_button::horizontal(model) segmented_button::horizontal(model)
.minimum_button_width(76)
.maximum_button_width(250)
.button_height(44) .button_height(44)
.button_padding([space_s, space_xs, space_s, space_xs]) .button_padding([space_s, space_xs, space_s, space_xs])
.style(crate::theme::SegmentedButton::TabBar) .style(crate::theme::SegmentedButton::TabBar)