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

Use bitflags for keyboard::Modifiers

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2021-07-12 22:01:57 +02:00
parent 735cfb7908
commit b57d567981
No known key found for this signature in database
GPG key ID: 44B88EB52AB1EE8D
6 changed files with 78 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

1
core/Cargo.toml
View file

@ -8,6 +8,7 @@ license = "MIT"
repository = "https://github.com/hecrj/iced" repository = "https://github.com/hecrj/iced"
[dependencies] [dependencies]
bitflags = "1.2"
[dependencies.palette] [dependencies.palette]
version = "0.5.0" version = "0.5.0"

76
core/src/keyboard/modifiers.rs
View file

@ -1,20 +1,53 @@
/// The current state of the keyboard modifiers. use bitflags::bitflags;
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
pub struct Modifiers {
/// Whether a shift key is pressed
pub shift: bool,
/// Whether a control key is pressed bitflags! {
pub control: bool, /// The current state of the keyboard modifiers.
#[derive(Default)]
/// Whether an alt key is pressed pub struct Modifiers: u32{
pub alt: bool, /// The "shift" key.
const SHIFT = 0b100 << 0;
/// Whether a logo key is pressed (e.g. windows key, command key...) // const LSHIFT = 0b010 << 0;
pub logo: bool, // const RSHIFT = 0b001 << 0;
//
/// The "control" key.
const CTRL = 0b100 << 3;
// const LCTRL = 0b010 << 3;
// const RCTRL = 0b001 << 3;
//
/// The "alt" key.
const ALT = 0b100 << 6;
// const LALT = 0b010 << 6;
// const RALT = 0b001 << 6;
//
/// The "windows" key on Windows, "command" key on Mac, and
/// "super" key on Linux.
const LOGO = 0b100 << 9;
// const LLOGO = 0b010 << 9;
// const RLOGO = 0b001 << 9;
}
} }
impl Modifiers { impl Modifiers {
/// Returns true if the [`SHIFT`] key is pressed in the [`Modifiers`].
pub fn shift(self) -> bool {
self.contains(Self::SHIFT)
}
/// Returns true if the [`CTRL`] key is pressed in the [`Modifiers`].
pub fn control(self) -> bool {
self.contains(Self::CTRL)
}
/// Returns true if the [`ALT`] key is pressed in the [`Modifiers`].
pub fn alt(self) -> bool {
self.contains(Self::ALT)
}
/// Returns true if the [`LOGO`] key is pressed in the [`Modifiers`].
pub fn logo(self) -> bool {
self.contains(Self::LOGO)
}
/// Returns true if a "command key" is pressed in the [`Modifiers`]. /// Returns true if a "command key" is pressed in the [`Modifiers`].
/// ///
/// The "command key" is the main modifier key used to issue commands in the /// The "command key" is the main modifier key used to issue commands in the
@ -22,24 +55,13 @@ impl Modifiers {
/// ///
/// - It is the `logo` or command key (⌘) on macOS /// - It is the `logo` or command key (⌘) on macOS
/// - It is the `control` key on other platforms /// - It is the `control` key on other platforms
pub fn is_command_pressed(self) -> bool { pub fn command(self) -> bool {
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
let is_pressed = self.logo; let is_pressed = self.logo();
#[cfg(not(target_os = "macos"))] #[cfg(not(target_os = "macos"))]
let is_pressed = self.control; let is_pressed = self.control();
is_pressed is_pressed
} }
/// Returns true if the current [`Modifiers`] have at least the same
/// keys pressed as the provided ones, and false otherwise.
pub fn matches(&self, modifiers: Self) -> bool {
let shift = !modifiers.shift || self.shift;
let control = !modifiers.control || self.control;
let alt = !modifiers.alt || self.alt;
let logo = !modifiers.logo || self.logo;
shift && control && alt && logo
}
} }

14
examples/menu/src/main.rs
View file

@ -43,18 +43,8 @@ impl Application for App {
} }
fn menu(&self) -> Menu<Message> { fn menu(&self) -> Menu<Message> {
let alt = Modifiers { let alt = Modifiers::ALT;
alt: true, let ctrl_shift = Modifiers::CTRL | Modifiers::SHIFT;
control: false,
logo: false,
shift: false,
};
let ctrl_shift = Modifiers {
control: true,
shift: true,
logo: false,
alt: false,
};
Menu::with_entries(vec![ Menu::with_entries(vec![
menu::Entry::dropdown( menu::Entry::dropdown(

2
examples/pane_grid/src/main.rs
View file

@ -146,7 +146,7 @@ impl Application for Example {
Event::Keyboard(keyboard::Event::KeyPressed { Event::Keyboard(keyboard::Event::KeyPressed {
modifiers, modifiers,
key_code, key_code,
}) if modifiers.is_command_pressed() => handle_hotkey(key_code), }) if modifiers.command() => handle_hotkey(key_code),
_ => None, _ => None,
} }
}) })

35
native/src/widget/text_input.rs
View file

@ -362,7 +362,7 @@ where
Event::Keyboard(keyboard::Event::CharacterReceived(c)) Event::Keyboard(keyboard::Event::CharacterReceived(c))
if self.state.is_focused if self.state.is_focused
&& self.state.is_pasting.is_none() && self.state.is_pasting.is_none()
&& !self.state.keyboard_modifiers.is_command_pressed() && !self.state.keyboard_modifiers.command()
&& !c.is_control() => && !c.is_control() =>
{ {
let mut editor = let mut editor =
@ -450,7 +450,7 @@ where
if platform::is_jump_modifier_pressed(modifiers) if platform::is_jump_modifier_pressed(modifiers)
&& !self.is_secure && !self.is_secure
{ {
if modifiers.shift { if modifiers.shift() {
self.state self.state
.cursor .cursor
.select_left_by_words(&self.value); .select_left_by_words(&self.value);
@ -459,7 +459,7 @@ where
.cursor .cursor
.move_left_by_words(&self.value); .move_left_by_words(&self.value);
} }
} else if modifiers.shift { } else if modifiers.shift() {
self.state.cursor.select_left(&self.value) self.state.cursor.select_left(&self.value)
} else { } else {
self.state.cursor.move_left(&self.value); self.state.cursor.move_left(&self.value);
@ -469,7 +469,7 @@ where
if platform::is_jump_modifier_pressed(modifiers) if platform::is_jump_modifier_pressed(modifiers)
&& !self.is_secure && !self.is_secure
{ {
if modifiers.shift { if modifiers.shift() {
self.state self.state
.cursor .cursor
.select_right_by_words(&self.value); .select_right_by_words(&self.value);
@ -478,14 +478,14 @@ where
.cursor .cursor
.move_right_by_words(&self.value); .move_right_by_words(&self.value);
} }
} else if modifiers.shift { } else if modifiers.shift() {
self.state.cursor.select_right(&self.value) self.state.cursor.select_right(&self.value)
} else { } else {
self.state.cursor.move_right(&self.value); self.state.cursor.move_right(&self.value);
} }
} }
keyboard::KeyCode::Home => { keyboard::KeyCode::Home => {
if modifiers.shift { if modifiers.shift() {
self.state.cursor.select_range( self.state.cursor.select_range(
self.state.cursor.start(&self.value), self.state.cursor.start(&self.value),
0, 0,
@ -495,7 +495,7 @@ where
} }
} }
keyboard::KeyCode::End => { keyboard::KeyCode::End => {
if modifiers.shift { if modifiers.shift() {
self.state.cursor.select_range( self.state.cursor.select_range(
self.state.cursor.start(&self.value), self.state.cursor.start(&self.value),
self.value.len(), self.value.len(),
@ -505,10 +505,7 @@ where
} }
} }
keyboard::KeyCode::C keyboard::KeyCode::C
if self if self.state.keyboard_modifiers.command() =>
.state
.keyboard_modifiers
.is_command_pressed() =>
{ {
match self.state.cursor.selection(&self.value) { match self.state.cursor.selection(&self.value) {
Some((start, end)) => { Some((start, end)) => {
@ -520,10 +517,7 @@ where
} }
} }
keyboard::KeyCode::X keyboard::KeyCode::X
if self if self.state.keyboard_modifiers.command() =>
.state
.keyboard_modifiers
.is_command_pressed() =>
{ {
match self.state.cursor.selection(&self.value) { match self.state.cursor.selection(&self.value) {
Some((start, end)) => { Some((start, end)) => {
@ -545,7 +539,7 @@ where
messages.push(message); messages.push(message);
} }
keyboard::KeyCode::V => { keyboard::KeyCode::V => {
if self.state.keyboard_modifiers.is_command_pressed() { if self.state.keyboard_modifiers.command() {
let content = match self.state.is_pasting.take() { let content = match self.state.is_pasting.take() {
Some(content) => content, Some(content) => content,
None => { None => {
@ -576,10 +570,7 @@ where
} }
} }
keyboard::KeyCode::A keyboard::KeyCode::A
if self if self.state.keyboard_modifiers.command() =>
.state
.keyboard_modifiers
.is_command_pressed() =>
{ {
self.state.cursor.select_all(&self.value); self.state.cursor.select_all(&self.value);
} }
@ -858,9 +849,9 @@ mod platform {
pub fn is_jump_modifier_pressed(modifiers: keyboard::Modifiers) -> bool { pub fn is_jump_modifier_pressed(modifiers: keyboard::Modifiers) -> bool {
if cfg!(target_os = "macos") { if cfg!(target_os = "macos") {
modifiers.alt modifiers.alt()
} else { } else {
modifiers.control modifiers.control()
} }
} }
} }

22
winit/src/conversion.rs
View file

@ -165,10 +165,10 @@ fn hotkey(hotkey: keyboard::Hotkey) -> winit::window::Hotkey {
use winit::event::ModifiersState; use winit::event::ModifiersState;
let mut modifiers = ModifiersState::empty(); let mut modifiers = ModifiersState::empty();
modifiers.set(ModifiersState::CTRL, hotkey.modifiers.control); modifiers.set(ModifiersState::CTRL, hotkey.modifiers.control());
modifiers.set(ModifiersState::SHIFT, hotkey.modifiers.shift); modifiers.set(ModifiersState::SHIFT, hotkey.modifiers.shift());
modifiers.set(ModifiersState::ALT, hotkey.modifiers.alt); modifiers.set(ModifiersState::ALT, hotkey.modifiers.alt());
modifiers.set(ModifiersState::LOGO, hotkey.modifiers.logo); modifiers.set(ModifiersState::LOGO, hotkey.modifiers.logo());
winit::window::Hotkey::new(modifiers, to_virtual_keycode(hotkey.key)) winit::window::Hotkey::new(modifiers, to_virtual_keycode(hotkey.key))
} }
@ -249,12 +249,14 @@ pub fn mouse_button(mouse_button: winit::event::MouseButton) -> mouse::Button {
pub fn modifiers( pub fn modifiers(
modifiers: winit::event::ModifiersState, modifiers: winit::event::ModifiersState,
) -> keyboard::Modifiers { ) -> keyboard::Modifiers {
keyboard::Modifiers { let mut result = keyboard::Modifiers::empty();
shift: modifiers.shift(),
control: modifiers.ctrl(), result.set(keyboard::Modifiers::SHIFT, modifiers.shift());
alt: modifiers.alt(), result.set(keyboard::Modifiers::CTRL, modifiers.ctrl());
logo: modifiers.logo(), result.set(keyboard::Modifiers::ALT, modifiers.alt());
} result.set(keyboard::Modifiers::LOGO, modifiers.logo());
result
} }
/// Converts a physical cursor position to a logical `Point`. /// Converts a physical cursor position to a logical `Point`.