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

Check only for partial match of modifier keys

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2020-03-18 07:10:36 +01:00
parent eba2ded88a
commit 50b02d41a0
2 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
native/src/widget/pane_grid.rs
View file

@ -260,7 +260,9 @@ where
if let Some(((pane, _), _)) = clicked_region.next() {
match &self.on_drag {
Some(on_drag)
if *self.modifiers == self.modifier_keys =>
if self
.modifiers
.matches(self.modifier_keys) =>
{
self.state.pick_pane(pane);
@ -309,7 +311,7 @@ where
state: ButtonState::Pressed,
}) if self.on_resize.is_some()
&& self.state.picked_pane().is_none()
&& *self.modifiers == self.modifier_keys =>
&& self.modifiers.matches(self.modifier_keys) =>
{
let bounds = layout.bounds();
let relative_cursor = Point::new(
@ -374,7 +376,7 @@ where
// TODO: Discard when event is captured
if state == ButtonState::Pressed {
if let Some(_) = self.state.idle_pane() {
if modifiers == self.modifier_keys {
if modifiers.matches(self.modifier_keys) {
if let Some(message) =
on_key_press(KeyPressEvent {
key_code,