kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

theme: add bar-position setting

Browse source
This commit is contained in:
Stipe Kotarac 2025-11-28 21:26:15 +01:00
parent 3ea687a5c8
commit 2500c05f70
15 changed files with 178 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/ifs/wl_surface/tray.rs
View file

@ -135,7 +135,6 @@ impl<T: TrayItem> DynTrayItem for T {
}
trait TrayItem: Sized + 'static {
fn send_initial_configure(&self);
fn send_current_configure(&self);
fn data(&self) -> &TrayItemData;
fn popups(&self) -> &CopyHashMap<XdgPopupId, Rc<Popup<Self>>>;
@ -353,7 +352,7 @@ fn install<T: TrayItem>(item: &Rc<T>) -> Result<(), TrayItemError> {
if let Some(node) = data.output.node() {
data.surface
.set_output(&node, NodeLocation::Output(node.id));
item.send_initial_configure();
item.send_current_configure();
}
Ok(())
}

23
src/ifs/wl_surface/tray/jay_tray_item_v1.rs
View file

@ -9,7 +9,9 @@ use {
ack_configure, destroy, get_popup, install,
},
},
xdg_positioner::{ANCHOR_BOTTOM_LEFT, ANCHOR_BOTTOM_RIGHT},
xdg_positioner::{
ANCHOR_BOTTOM_LEFT, ANCHOR_BOTTOM_RIGHT, ANCHOR_TOP_LEFT, ANCHOR_TOP_RIGHT,
},
},
leaks::Tracker,
object::{Object, Version},
@ -17,6 +19,7 @@ use {
utils::copyhashmap::CopyHashMap,
wire::{JayTrayItemV1Id, XdgPopupId, jay_tray_item_v1::*},
},
jay_config::theme::BarPosition,
std::rc::Rc,
thiserror::Error,
};
@ -59,16 +62,24 @@ impl JayTrayItemV1 {
}
fn send_preferred_anchor(&self) {
let anchor = match self.data.client.state.theme.bar_position.get() {
BarPosition::Bottom => ANCHOR_TOP_RIGHT,
BarPosition::Top | _ => ANCHOR_BOTTOM_RIGHT,
};
self.data.client.event(PreferredAnchor {
self_id: self.id,
anchor: ANCHOR_BOTTOM_LEFT,
anchor,
});
}
fn send_preferred_gravity(&self) {
let gravity = match self.data.client.state.theme.bar_position.get() {
BarPosition::Bottom => ANCHOR_TOP_LEFT,
BarPosition::Top | _ => ANCHOR_BOTTOM_LEFT,
};
self.data.client.event(PreferredGravity {
self_id: self.id,
gravity: ANCHOR_BOTTOM_RIGHT,
gravity,
});
}
@ -106,13 +117,9 @@ impl JayTrayItemV1RequestHandler for JayTrayItemV1 {
}
impl TrayItem for JayTrayItemV1 {
fn send_initial_configure(&self) {
fn send_current_configure(&self) {
self.send_preferred_anchor();
self.send_preferred_gravity();
<Self as TrayItem>::send_current_configure(self);
}
fn send_current_configure(&self) {
let size = self.data.client.state.tray_icon_size().max(1);
self.send_configure_size(size, size);
self.send_configure();