me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Enable slider scrolling only when Ctrl is pressed

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-09-13 23:45:30 +02:00
parent 0d298b70d2
commit cdf02ddda9
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
2 changed files with 36 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

34
widget/src/slider.rs
View file

@ -288,22 +288,6 @@ where
}; };
match event { match event {
Event::Mouse(mouse::Event::WheelScrolled { delta }) => {
if let Some(_) = cursor.position_over(layout.bounds()) {
let delta = match delta {
mouse::ScrollDelta::Lines { x: _, y } => y,
mouse::ScrollDelta::Pixels { x: _, y } => y,
};
if delta < 0.0 {
let _ = decrement(current_value).map(change);
} else {
let _ = increment(current_value).map(change);
}
return event::Status::Captured;
}
}
Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
| Event::Touch(touch::Event::FingerPressed { .. }) => { | Event::Touch(touch::Event::FingerPressed { .. }) => {
if let Some(cursor_position) = if let Some(cursor_position) =
@ -340,6 +324,24 @@ where
return event::Status::Captured; return event::Status::Captured;
} }
} }
Event::Mouse(mouse::Event::WheelScrolled { delta })
if state.keyboard_modifiers.control() =>
{
if let Some(_) = cursor.position_over(layout.bounds()) {
let delta = match delta {
mouse::ScrollDelta::Lines { x: _, y } => y,
mouse::ScrollDelta::Pixels { x: _, y } => y,
};
if delta < 0.0 {
let _ = decrement(current_value).map(change);
} else {
let _ = increment(current_value).map(change);
}
return event::Status::Captured;
}
}
Event::Keyboard(keyboard::Event::KeyPressed { key, .. }) => { Event::Keyboard(keyboard::Event::KeyPressed { key, .. }) => {
if cursor.position_over(layout.bounds()).is_some() { if cursor.position_over(layout.bounds()).is_some() {
match key { match key {

34
widget/src/vertical_slider.rs
View file

@ -291,22 +291,6 @@ where
}; };
match event { match event {
Event::Mouse(mouse::Event::WheelScrolled { delta }) => {
if let Some(_) = cursor.position_over(layout.bounds()) {
let delta = match delta {
mouse::ScrollDelta::Lines { x: _, y } => y,
mouse::ScrollDelta::Pixels { x: _, y } => y,
};
if delta < 0.0 {
let _ = decrement(current_value).map(change);
} else {
let _ = increment(current_value).map(change);
}
return event::Status::Captured;
}
}
Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
| Event::Touch(touch::Event::FingerPressed { .. }) => { | Event::Touch(touch::Event::FingerPressed { .. }) => {
if let Some(cursor_position) = if let Some(cursor_position) =
@ -345,6 +329,24 @@ where
return event::Status::Captured; return event::Status::Captured;
} }
} }
Event::Mouse(mouse::Event::WheelScrolled { delta })
if state.keyboard_modifiers.control() =>
{
if let Some(_) = cursor.position_over(layout.bounds()) {
let delta = match delta {
mouse::ScrollDelta::Lines { x: _, y } => y,
mouse::ScrollDelta::Pixels { x: _, y } => y,
};
if delta < 0.0 {
let _ = decrement(current_value).map(change);
} else {
let _ = increment(current_value).map(change);
}
return event::Status::Captured;
}
}
Event::Keyboard(keyboard::Event::KeyPressed { key, .. }) => { Event::Keyboard(keyboard::Event::KeyPressed { key, .. }) => {
if cursor.position_over(layout.bounds()).is_some() { if cursor.position_over(layout.bounds()).is_some() {
match key { match key {