pogmommy/eww
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

systray: add prepend-new property to prepend new icons to the container

Browse source
This commit is contained in:
MoetaYuko 2024-02-26 13:38:35 +08:00 • committed by ElKowar
parent e74dd6fa45
commit 149727ce1f
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
crates/eww/src/widgets/systray.rs
View file

@ -2,7 +2,7 @@ use crate::widgets::window::Window;
use futures::StreamExt; use futures::StreamExt;
use gtk::{cairo::Surface, gdk::ffi::gdk_cairo_surface_create_from_pixbuf, prelude::*}; use gtk::{cairo::Surface, gdk::ffi::gdk_cairo_surface_create_from_pixbuf, prelude::*};
use notifier_host; use notifier_host;
use std::{future::Future, rc::Rc}; use std::{cell::RefCell, future::Future, rc::Rc};
// DBus state shared between systray instances, to avoid creating too many connections etc. // DBus state shared between systray instances, to avoid creating too many connections etc.
struct DBusSession { struct DBusSession {
@ -32,12 +32,13 @@ fn run_async_task<F: Future>(f: F) -> F::Output {
pub struct Props { pub struct Props {
icon_size_tx: tokio::sync::watch::Sender<i32>, icon_size_tx: tokio::sync::watch::Sender<i32>,
pub prepend_new: Rc<RefCell<bool>>,
} }
impl Props { impl Props {
pub fn new() -> Self { pub fn new() -> Self {
let (icon_size_tx, _) = tokio::sync::watch::channel(24); let (icon_size_tx, _) = tokio::sync::watch::channel(24);
Self { icon_size_tx } Self { icon_size_tx, prepend_new: Rc::new(RefCell::new(false)) }
} }
pub fn icon_size(&self, value: i32) { pub fn icon_size(&self, value: i32) {
@ -57,10 +58,16 @@ struct Tray {
items: std::collections::HashMap<String, Item>, items: std::collections::HashMap<String, Item>,
icon_size: tokio::sync::watch::Receiver<i32>, icon_size: tokio::sync::watch::Receiver<i32>,
prepend_new: Rc<RefCell<bool>>,
} }
pub fn spawn_systray(container: &gtk::Box, props: &Props) { pub fn spawn_systray(container: &gtk::Box, props: &Props) {
let mut systray = Tray { container: container.clone(), items: Default::default(), icon_size: props.icon_size_tx.subscribe() }; let mut systray = Tray {
container: container.clone(),
items: Default::default(),
icon_size: props.icon_size_tx.subscribe(),
prepend_new: props.prepend_new.clone(),
};
let task = glib::MainContext::default().spawn_local(async move { let task = glib::MainContext::default().spawn_local(async move {
let s = match dbus_session().await { let s = match dbus_session().await {
@ -85,7 +92,11 @@ pub fn spawn_systray(container: &gtk::Box, props: &Props) {
impl notifier_host::Host for Tray { impl notifier_host::Host for Tray {
fn add_item(&mut self, id: &str, item: notifier_host::Item) { fn add_item(&mut self, id: &str, item: notifier_host::Item) {
let item = Item::new(id.to_owned(), item, self.icon_size.clone()); let item = Item::new(id.to_owned(), item, self.icon_size.clone());
self.container.add(&item.widget); if *self.prepend_new.borrow() {
self.container.pack_end(&item.widget, true, true, 0);
} else {
self.container.pack_start(&item.widget, true, true, 0);
}
if let Some(old_item) = self.items.insert(id.to_string(), item) { if let Some(old_item) = self.items.insert(id.to_string(), item) {
self.container.remove(&old_item.widget); self.container.remove(&old_item.widget);
} }

5
crates/eww/src/widgets/widget_definitions.rs
View file

@ -1142,6 +1142,7 @@ fn build_systray(bargs: &mut BuilderArgs) -> Result<gtk::Box> {
let gtk_widget = gtk::Box::new(gtk::Orientation::Horizontal, 0); let gtk_widget = gtk::Box::new(gtk::Orientation::Horizontal, 0);
let props = Rc::new(systray::Props::new()); let props = Rc::new(systray::Props::new());
let props_clone = props.clone(); // copies for def_widget let props_clone = props.clone(); // copies for def_widget
let props_clone2 = props.clone(); // copies for def_widget
def_widget!(bargs, _g, gtk_widget, { def_widget!(bargs, _g, gtk_widget, {
// @prop spacing - spacing between elements // @prop spacing - spacing between elements
@ -1158,6 +1159,10 @@ fn build_systray(bargs: &mut BuilderArgs) -> Result<gtk::Box> {
props.icon_size(icon_size); props.icon_size(icon_size);
} }
}, },
// @prop prepend-new - prepend new icons.
prop(prepend_new: as_bool = true) {
*props_clone2.prepend_new.borrow_mut() = prepend_new;
},
}); });
systray::spawn_systray(&gtk_widget, &props_clone); systray::spawn_systray(&gtk_widget, &props_clone);