Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions cosmic-applet-a11y/src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,13 @@ impl cosmic::Application for CosmicA11yApplet {
&mut self.core
}

fn on_escape(&mut self) -> app::Task<Self::Message> {
if let Some(p) = self.popup.take() {
return destroy_popup(p);
}
Task::none()
}

fn update(&mut self, message: Self::Message) -> app::Task<Self::Message> {
match message {
Message::ScreenReaderEnabled(enabled) => {
Expand Down
8 changes: 8 additions & 0 deletions cosmic-applet-audio/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ use cosmic::{
iced::{
self, Alignment, Length, Rectangle, Subscription,
futures::StreamExt,
platform_specific::shell::wayland::commands::popup::destroy_popup,
widget::{self, column, row, slider},
window,
},
Expand Down Expand Up @@ -317,6 +318,13 @@ impl cosmic::Application for Audio {
Some(cosmic::applet::style())
}

fn on_escape(&mut self) -> app::Task<Self::Message> {
if let Some(p) = self.popup.take() {
return destroy_popup(p);
}
Task::none()
}

fn update(&mut self, message: Message) -> app::Task<Message> {
match message {
Message::Rectangle(u) => match u {
Expand Down
9 changes: 9 additions & 0 deletions cosmic-applet-battery/src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,15 @@ impl cosmic::Application for CosmicBatteryApplet {
&mut self.core
}

fn on_escape(&mut self) -> app::Task<Self::Message> {
if let Some(p) = self.popup.take() {
self.dragging_kbd_brightness = false;
self.dragging_screen_brightness = false;
return destroy_popup(p);
}
Task::none()
}

fn update(&mut self, message: Self::Message) -> app::Task<Self::Message> {
match message {
Message::SetKbdBrightness(brightness) => {
Expand Down
7 changes: 7 additions & 0 deletions cosmic-applet-bluetooth/src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,13 @@ impl cosmic::Application for CosmicBluetoothApplet {
&mut self.core
}

fn on_escape(&mut self) -> app::Task<Self::Message> {
if let Some(p) = self.popup.take() {
return destroy_popup(p);
}
Task::none()
}

fn update(&mut self, message: Self::Message) -> app::Task<Self::Message> {
match message {
Message::TogglePopup => {
Expand Down
7 changes: 7 additions & 0 deletions cosmic-applet-input-sources/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,13 @@ impl cosmic::Application for Window {
Some(Message::PopupClosed(id))
}

fn on_escape(&mut self) -> Task<cosmic::Action<Self::Message>> {
if let Some(p) = self.popup.take() {
return destroy_popup(p);
}
Task::none()
}

fn update(&mut self, message: Self::Message) -> app::Task<Self::Message> {
match message {
Message::TogglePopup => {
Expand Down
8 changes: 8 additions & 0 deletions cosmic-applet-network/src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1113,6 +1113,14 @@ impl cosmic::Application for CosmicNetworkApplet {
&mut self.core
}

fn on_escape(&mut self) -> app::Task<Self::Message> {
if let Some(p) = self.popup.take() {
self.show_visible_networks = false;
return destroy_popup(p);
}
Task::none()
}

fn update(&mut self, message: Message) -> app::Task<Message> {
match message {
Message::TogglePopup => {
Expand Down
7 changes: 7 additions & 0 deletions cosmic-applet-notifications/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,13 @@ impl cosmic::Application for Notifications {
])
}

fn on_escape(&mut self) -> app::Task<Self::Message> {
if let Some(p) = self.popup.take() {
return destroy_popup(p);
}
Task::none()
}

fn update(&mut self, message: Self::Message) -> app::Task<Self::Message> {
match message {
Message::TogglePopup => {
Expand Down
7 changes: 7 additions & 0 deletions cosmic-applet-power/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,13 @@ impl cosmic::Application for Power {
Some(Message::Closed(id))
}

fn on_escape(&mut self) -> app::Task<Self::Message> {
if let Some(p) = self.popup.take() {
return destroy_popup(p);
}
Task::none()
}

fn update(&mut self, message: Self::Message) -> app::Task<Self::Message> {
match message {
Message::TogglePopup => {
Expand Down
8 changes: 8 additions & 0 deletions cosmic-applet-status-area/src/components/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,14 @@ impl cosmic::Application for App {
Some(cosmic::applet::style())
}

fn on_escape(&mut self) -> app::Task<Self::Message> {
if let Some(p) = self.popup.take() {
self.open_menu = None;
return destroy_popup(p);
}
Task::none()
}

fn update(&mut self, message: Msg) -> app::Task<Msg> {
match message {
Msg::None => Task::none(),
Expand Down
7 changes: 7 additions & 0 deletions cosmic-applet-tiling/src/window.rs
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,13 @@ impl cosmic::Application for Window {
Some(Message::PopupClosed(id))
}

fn on_escape(&mut self) -> app::Task<Self::Message> {
if let Some(p) = self.popup.take() {
return destroy_popup(p);
}
Task::none()
}

fn subscription(&self) -> Subscription<Self::Message> {
Subscription::batch([
self.core
Expand Down
7 changes: 7 additions & 0 deletions cosmic-applet-time/src/window.rs
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,13 @@ impl cosmic::Application for Window {
Some(cosmic::applet::style())
}

fn on_escape(&mut self) -> app::Task<Self::Message> {
if let Some(p) = self.popup.take() {
return destroy_popup(p);
}
Task::none()
}

fn subscription(&self) -> Subscription<Message> {
fn time_subscription(mut show_seconds: watch::Receiver<bool>) -> Subscription<Message> {
struct Wrapper {
Expand Down