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

fix(segmented-button): hover style not being applied

Browse source
This commit is contained in:
Michael Aaron Murphy 2023-01-19 22:32:58 +01:00
parent f386609414
commit e9766389c4
No known key found for this signature in database
GPG key ID: B2732D4240C9212C
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/widget/segmented_button/model/mod.rs
View file

@ -11,7 +11,6 @@ mod selection;
pub use self::selection::{MultiSelect, Selectable, SingleSelect}; pub use self::selection::{MultiSelect, Selectable, SingleSelect};
use crate::widget::IconSource; use crate::widget::IconSource;
use crate::Element;
use slotmap::{SecondaryMap, SlotMap}; use slotmap::{SecondaryMap, SlotMap};
use std::any::{Any, TypeId}; use std::any::{Any, TypeId};
use std::borrow::Cow; use std::borrow::Cow;

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

@ -298,13 +298,13 @@ where
let bounds = self.variant_button_bounds(bounds, nth); let bounds = self.variant_button_bounds(bounds, nth);
if bounds.contains(cursor_position) { if bounds.contains(cursor_position) {
if self.model.items[key].enabled { if self.model.items[key].enabled {
// Record that the mouse is hovering over this button.
state.hovered = key;
if let Some(on_activate) = self.on_activate.as_ref() { if let Some(on_activate) = self.on_activate.as_ref() {
if let Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Left)) if let Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Left))
| Event::Touch(touch::Event::FingerLifted { .. }) = event | Event::Touch(touch::Event::FingerLifted { .. }) = event
{ {
// Record that the mouse is hovering over this button.
state.hovered = key;
shell.publish(on_activate(key)); shell.publish(on_activate(key));
return event::Status::Captured; return event::Status::Captured;
} }