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

feat: Re-orderable positioning of items in segmented button

Browse source 
Calling `model.swap_position(key1, key2)` will swap the positions of
these two items in the model.
This commit is contained in:
Michael Aaron Murphy 2023-01-09 19:26:31 +01:00 • committed by Michael Murphy
parent a55f41fc42
commit c4bd0fa3d8
3 changed files with 68 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/widget/segmented_button/widget.rs
View file

@ -148,21 +148,22 @@ where
/// Focus the previous item in the widget.
fn focus_previous(&mut self, state: &mut LocalState) -> event::Status {
let mut previous_key = None;
let mut keys = self.model.order.iter().copied().rev();
for key in self.model.items.keys() {
while let Some(key) = keys.next() {
if key == state.focused_key {
if let Some(key) = previous_key {
for key in keys {
// Skip disabled buttons.
if !self.is_enabled(key) {
continue;
}
state.focused_key = key;
return event::Status::Captured;
}
break;
}
if self.is_enabled(key) {
previous_key = Some(key);
}
}
state.focused_key = Key::default();
@ -171,7 +172,7 @@ where
/// Focus the next item in the widget.
fn focus_next(&mut self, state: &mut LocalState) -> event::Status {
let mut keys = self.model.items.keys();
let mut keys = self.model.order.iter().copied();
while let Some(key) = keys.next() {
if key == state.focused_key {
@ -258,7 +259,7 @@ where
fn state(&self) -> tree::State {
tree::State::new(LocalState {
first: self.model.items.keys().next().unwrap_or_default(),
first: self.model.order.iter().copied().next().unwrap_or_default(),
..LocalState::default()
})
}
@ -289,10 +290,10 @@ where
let state = tree.state.downcast_mut::<LocalState>();
if bounds.contains(cursor_position) {
for (nth, (key, content)) in self.model.items.iter().enumerate() {
for (nth, key) in self.model.order.iter().copied().enumerate() {
let bounds = self.variant_button_bounds(bounds, nth);
if bounds.contains(cursor_position) {
if content.enabled {
if self.model.items[key].enabled {
if let Some(on_activate) = self.on_activate.as_ref() {
if let Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Left))
| Event::Touch(touch::Event::FingerLifted { .. }) = event
@ -363,12 +364,12 @@ where
let bounds = layout.bounds();
if bounds.contains(cursor_position) {
for (nth, content) in self.model.items.values().enumerate() {
for (nth, key) in self.model.order.iter().copied().enumerate() {
if self
.variant_button_bounds(bounds, nth)
.contains(cursor_position)
{
return if content.enabled {
return if self.model.items[key].enabled {
iced_native::mouse::Interaction::Pointer
} else {
iced_native::mouse::Interaction::Idle
@ -410,7 +411,9 @@ where
}
// Draw each of the items in the widget.
for (nth, (key, content)) in self.model.items.iter().enumerate() {
for (nth, key) in self.model.order.iter().copied().enumerate() {
let content = &self.model.items[key];
let mut bounds = self.variant_button_bounds(bounds, nth);
let (status_appearance, font) = if state.focused_key == key {