leyoda/cosmic-files
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rebase on new libcosmic and iced

Browse source
This commit is contained in:
Jeremy Soller 2024-02-09 07:09:51 -07:00
parent 88089fecb4
commit cb4bd84ea5
6 changed files with 611 additions and 654 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/app.rs
View file

@ -8,7 +8,7 @@ use cosmic::{
iced::{
event,
futures::{self, SinkExt},
keyboard::{Event as KeyEvent, KeyCode, Modifiers},
keyboard::{Event as KeyEvent, Key, Modifiers},
subscription::{self, Subscription},
window, Event, Length, Point,
},
@ -104,7 +104,7 @@ pub enum Message {
Config(Config),
Copy(Option<segmented_button::Entity>),
Cut(Option<segmented_button::Entity>),
Key(Modifiers, KeyCode),
Key(Modifiers, Key),
Modifiers(Modifiers),
MoveToTrash(Option<segmented_button::Entity>),
NewFile(Option<segmented_button::Entity>),
@ -564,10 +564,10 @@ impl Application for App {
Message::Cut(entity_opt) => {
log::warn!("TODO: CUT");
}
Message::Key(modifiers, key_code) => {
Message::Key(modifiers, key) => {
let entity = self.tab_model.active();
for (key_bind, action) in self.key_binds.iter() {
if key_bind.matches(modifiers, key_code) {
if key_bind.matches(modifiers, &key) {
return self.update(action.message(Some(entity)));
}
}
@ -937,10 +937,9 @@ impl Application for App {
let mut subscriptions = vec![
event::listen_with(|event, _status| match event {
Event::Keyboard(KeyEvent::KeyPressed {
key_code,
modifiers,
}) => Some(Message::Key(modifiers, key_code)),
Event::Keyboard(KeyEvent::KeyPressed { key, modifiers, .. }) => {
Some(Message::Key(modifiers, key))
}
Event::Keyboard(KeyEvent::ModifiersChanged(modifiers)) => {
Some(Message::Modifiers(modifiers))
}