leyoda/cosmic-applets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: status area positioning

Browse source
This commit is contained in:
Ashley Wulber 2025-12-30 12:01:22 -05:00 • committed by Ashley Wulber
parent 50d931b191
commit 2852f3cc16
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
cosmic-applet-status-area/src/components/app.rs
View file

@ -248,7 +248,7 @@ impl cosmic::Application for App {
Some((i, self.core.main_window_id().unwrap())) Some((i, self.core.main_window_id().unwrap()))
} }
}) })
.unwrap_or((0, self.core.main_window_id().unwrap())); .unwrap_or((i, self.core.main_window_id().unwrap()));
let mut popup_settings = self let mut popup_settings = self
.core .core
@ -360,7 +360,7 @@ impl cosmic::Application for App {
Some((i, self.core.main_window_id().unwrap())) Some((i, self.core.main_window_id().unwrap()))
} }
}) })
.unwrap_or((0, self.core.main_window_id().unwrap())); .unwrap_or((i, self.core.main_window_id().unwrap()));
let mut popup_settings = self let mut popup_settings = self
.core .core
@ -372,12 +372,12 @@ impl cosmic::Application for App {
self.core.applet.anchor, self.core.applet.anchor,
PanelAnchor::Left | PanelAnchor::Right PanelAnchor::Left | PanelAnchor::Right
) { ) {
let suggested_size = self.core.applet.suggested_size(false).1 let suggested_size = self.core.applet.suggested_size(true).1
+ 2 * self.core.applet.suggested_padding(false).1; + 2 * self.core.applet.suggested_padding(true).1;
popup_settings.positioner.anchor_rect.y = i as i32 * suggested_size as i32; popup_settings.positioner.anchor_rect.y = i as i32 * suggested_size as i32;
} else { } else {
let suggested_size = self.core.applet.suggested_size(false).0 let suggested_size = self.core.applet.suggested_size(true).0
+ 2 * self.core.applet.suggested_padding(false).1; + 2 * self.core.applet.suggested_padding(true).0;
popup_settings.positioner.anchor_rect.x = i as i32 * suggested_size as i32; popup_settings.positioner.anchor_rect.x = i as i32 * suggested_size as i32;
} }
cmds.push(get_popup(popup_settings)); cmds.push(get_popup(popup_settings));
@ -409,13 +409,13 @@ impl cosmic::Application for App {
self.core.applet.anchor, self.core.applet.anchor,
PanelAnchor::Left | PanelAnchor::Right PanelAnchor::Left | PanelAnchor::Right
) { ) {
let suggested_size = self.core.applet.suggested_size(false).1 let suggested_size = self.core.applet.suggested_size(true).1
+ 2 * self.core.applet.suggested_padding(false).1; + 2 * self.core.applet.suggested_padding(true).1;
popup_settings.positioner.anchor_rect.y = popup_settings.positioner.anchor_rect.y =
overflow_index as i32 * suggested_size as i32; overflow_index as i32 * suggested_size as i32;
} else { } else {
let suggested_size = self.core.applet.suggested_size(false).0 let suggested_size = self.core.applet.suggested_size(true).0
+ 2 * self.core.applet.suggested_padding(false).1; + 2 * self.core.applet.suggested_padding(true).0;
popup_settings.positioner.anchor_rect.x = popup_settings.positioner.anchor_rect.x =
overflow_index as i32 * suggested_size as i32; overflow_index as i32 * suggested_size as i32;
} }