mirror of
https://github.com/Zedfrigg/ironbar.git
synced 2025-08-17 23:01:04 +02:00
refactor: replace channel macros with ext trait methods
This commit is contained in:
parent
d5744f597c
commit
f929aef2d9
50 changed files with 658 additions and 476 deletions
|
@ -9,6 +9,7 @@ use self::r#box::BoxWidget;
|
|||
use self::image::ImageWidget;
|
||||
use self::label::LabelWidget;
|
||||
use self::slider::SliderWidget;
|
||||
use crate::channels::AsyncSenderExt;
|
||||
use crate::config::{CommonConfig, ModuleConfig};
|
||||
use crate::modules::custom::button::ButtonWidget;
|
||||
use crate::modules::custom::progress::ProgressWidget;
|
||||
|
@ -17,7 +18,7 @@ use crate::modules::{
|
|||
ModuleUpdateEvent, PopupButton, PopupModuleFactory, WidgetContext, wrap_widget,
|
||||
};
|
||||
use crate::script::Script;
|
||||
use crate::{module_impl, send_async, spawn};
|
||||
use crate::{module_impl, spawn};
|
||||
use color_eyre::Result;
|
||||
use gtk::prelude::*;
|
||||
use gtk::{Button, IconTheme, Orientation};
|
||||
|
@ -205,11 +206,12 @@ impl Module<gtk::Box> for CustomModule {
|
|||
let args = event.args.unwrap_or_default();
|
||||
script.run_as_oneshot(Some(&args));
|
||||
} else if event.cmd == "popup:toggle" {
|
||||
send_async!(tx, ModuleUpdateEvent::TogglePopup(event.id));
|
||||
tx.send_expect(ModuleUpdateEvent::TogglePopup(event.id))
|
||||
.await;
|
||||
} else if event.cmd == "popup:open" {
|
||||
send_async!(tx, ModuleUpdateEvent::OpenPopup(event.id));
|
||||
tx.send_expect(ModuleUpdateEvent::OpenPopup(event.id)).await;
|
||||
} else if event.cmd == "popup:close" {
|
||||
send_async!(tx, ModuleUpdateEvent::ClosePopup);
|
||||
tx.send_expect(ModuleUpdateEvent::ClosePopup).await;
|
||||
} else {
|
||||
error!("Received invalid command: '{}'", event.cmd);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue