reivilibre/iced-mobile
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename PaneGrid::modifiers to pressed_modifiers

Browse Source
This commit is contained in:
Héctor Ramón Jiménez 2020-03-19 08:21:23 +01:00
parent 50b02d41a0
commit a820b8ce7b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
native/src/widget/pane_grid.rs
View File

@ -20,7 +20,7 @@ use crate::{
#[allow(missing_debug_implementations)] #[allow(missing_debug_implementations)]
pub struct PaneGrid<'a, Message, Renderer> { pub struct PaneGrid<'a, Message, Renderer> {
state: &'a mut state::Internal, state: &'a mut state::Internal,
modifiers: &'a mut keyboard::ModifiersState, pressed_modifiers: &'a mut keyboard::ModifiersState,
elements: Vec<(Pane, Element<'a, Message, Renderer>)>, elements: Vec<(Pane, Element<'a, Message, Renderer>)>,
width: Length, width: Length,
height: Length, height: Length,
@ -64,7 +64,7 @@ impl<'a, Message, Renderer> PaneGrid<'a, Message, Renderer> {
Self { Self {
state: &mut state.internal, state: &mut state.internal,
modifiers: &mut state.modifiers, pressed_modifiers: &mut state.modifiers,
elements, elements,
width: Length::Fill, width: Length::Fill,
height: Length::Fill, height: Length::Fill,
@ -261,7 +261,7 @@ where
match &self.on_drag { match &self.on_drag {
Some(on_drag) Some(on_drag)
if self if self
.modifiers .pressed_modifiers
.matches(self.modifier_keys) => .matches(self.modifier_keys) =>
{ {
self.state.pick_pane(pane); self.state.pick_pane(pane);
@ -311,7 +311,7 @@ where
state: ButtonState::Pressed, state: ButtonState::Pressed,
}) if self.on_resize.is_some() }) if self.on_resize.is_some()
&& self.state.picked_pane().is_none() && self.state.picked_pane().is_none()
&& self.modifiers.matches(self.modifier_keys) => && self.pressed_modifiers.matches(self.modifier_keys) =>
{ {
let bounds = layout.bounds(); let bounds = layout.bounds();
let relative_cursor = Point::new( let relative_cursor = Point::new(
@ -390,7 +390,7 @@ where
} }
} }
*self.modifiers = modifiers; *self.pressed_modifiers = modifiers;
} }
_ => {} _ => {}
} }