chore: fixes after libcosmic update

This commit is contained in:
Hojjat 2026-05-26 10:51:59 -06:00 committed by Lionel DARNIS
parent 98778333f4
commit 2480d5cb0d
4 changed files with 20 additions and 8 deletions

View file

@ -7,6 +7,7 @@ use cosmic::iced::clipboard::dnd::DndAction;
use cosmic::iced::core::SmolStr;
use cosmic::iced::core::widget::operation::focusable::unfocus;
use cosmic::iced::futures::{self, SinkExt};
use cosmic::iced::keyboard::key::Physical;
use cosmic::iced::keyboard::{Event as KeyEvent, Key, Modifiers};
#[cfg(all(feature = "wayland", feature = "desktop-applet"))]
use cosmic::iced::platform_specific::shell::wayland::commands::overlap_notify::overlap_notify;
@ -460,7 +461,7 @@ pub enum Message {
ExtractToResult(DialogResult),
#[cfg(all(feature = "wayland", feature = "desktop-applet"))]
Focused(window::Id),
Key(window::Id, Modifiers, Key, Option<SmolStr>),
Key(window::Id, Modifiers, Key, Physical, Option<SmolStr>),
LaunchUrl(String),
MaybeExit,
ModifiersChanged(window::Id, Modifiers),
@ -3654,7 +3655,7 @@ impl Application for App {
return dialog.update(dialog_message);
}
}
Message::Key(window_id, modifiers, key, text) => {
Message::Key(window_id, modifiers, key, physical_key, text) => {
#[cfg(all(feature = "wayland", feature = "desktop-applet"))]
let in_surface_ids = self.surface_ids.values().any(|id| *id == window_id);
#[cfg(not(all(feature = "wayland", feature = "desktop-applet")))]
@ -7072,11 +7073,14 @@ impl Application for App {
},
Event::Keyboard(KeyEvent::KeyPressed {
key,
physical_key,
modifiers,
text,
..
}) => match status {
event::Status::Ignored => Some(Message::Key(window_id, modifiers, key, text)),
event::Status::Ignored => {
Some(Message::Key(window_id, modifiers, key, physical_key, text))
}
event::Status::Captured => None,
},
Event::Keyboard(KeyEvent::ModifiersChanged(modifiers)) => {

View file

@ -6,7 +6,7 @@ use cosmic::app::{Core, Task, context_drawer};
use cosmic::iced::core::SmolStr;
use cosmic::iced::core::widget::operation;
use cosmic::iced::futures::{self, SinkExt};
use cosmic::iced::keyboard::key::Named;
use cosmic::iced::keyboard::key::{Named, Physical};
use cosmic::iced::keyboard::{Event as KeyEvent, Key, Modifiers};
use cosmic::iced::platform_specific::shell::{self as iced_winit, SurfaceIdWrapper};
use cosmic::iced::widget::scrollable;
@ -456,7 +456,7 @@ enum Message {
Escape,
Filename(String),
Filter(usize),
Key(Modifiers, Key, Option<SmolStr>),
Key(Modifiers, Key, Physical, Option<SmolStr>),
ModifiersChanged(Modifiers),
MounterItems(MounterKey, MounterItems),
Mouse(window::Id, mouse::Button),
@ -1456,7 +1456,7 @@ impl Application for App {
}
return self.rescan_tab(None);
}
Message::Key(modifiers, key, text) => {
Message::Key(modifiers, key, physical_key, text) => {
for (key_bind, action) in &self.key_binds {
if key_bind.matches(modifiers, &key, None) {
return self.update(Message::from(action.message()));
@ -2056,11 +2056,14 @@ impl Application for App {
},
Event::Keyboard(KeyEvent::KeyPressed {
key,
physical_key,
modifiers,
text,
..
}) => match status {
event::Status::Ignored => Some(Message::Key(modifiers, key, text)),
event::Status::Ignored => {
Some(Message::Key(modifiers, key, physical_key, text))
}
event::Status::Captured => {
if key == Key::Named(Named::Escape) {
Some(Message::Escape)

View file

@ -72,6 +72,7 @@ pub fn context_menu<'a>(
color.alpha *= 0.75;
TextStyle {
color: Some(color.into()),
..Default::default()
}
}
fn disabled_style(theme: &cosmic::Theme) -> TextStyle {
@ -79,6 +80,7 @@ pub fn context_menu<'a>(
color.alpha *= 0.5;
TextStyle {
color: Some(color.into()),
..Default::default()
}
}

View file

@ -7595,7 +7595,10 @@ mod tests {
// Text editor content may add a trailing newline
assert_eq!(content.text().trim_end(), "ab");
}
_ => panic!("expected Text thumbnail with valid prefix only, got {:?}", thumb),
_ => panic!(
"expected Text thumbnail with valid prefix only, got {:?}",
thumb
),
}
Ok(())
}