Skip to content

Fix popup location, and popups closing. #1184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
74togo wants to merge 3 commits into from
Closed

Fix popup location, and popups closing. #1184

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45b4e3e
Fix popup location, and popups closing.
Dec 5, 2025
79d7877
Merge branch 'master' into master
74togo Dec 25, 2025
7e341f8
Merge branch 'master' into master
74togo Dec 30, 2025
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
54 changes: 1 addition & 53 deletions cosmic-applet-status-area/src/components/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ pub enum Msg {
StatusMenu((usize, status_menu::Msg)),
StatusNotifier(status_notifier_watcher::Event),
TogglePopup(usize),
Hovered(usize),
Surface(surface::Action),
ToggleOverflow,
HoveredOverflow,
Expand Down Expand Up @@ -99,7 +98,6 @@ impl App {
mouse_area(
menu_icon_button(&self.core.applet, &menu).on_press_down(Msg::TogglePopup(*id)),
)
.on_enter(Msg::Hovered(*id))
.into()
});

Expand Down Expand Up @@ -248,7 +246,7 @@ impl cosmic::Application for App {
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
.core
Expand Down Expand Up @@ -333,56 +331,6 @@ impl cosmic::Application for App {
return Task::none();
}
},
Msg::Hovered(id) => {
let mut cmds = Vec::new();
if let Some(old_id) = self.open_menu.take() {
if old_id != id {
if let Some(popup_id) = self.popup.take() {
cmds.push(destroy_popup(popup_id));
}
self.open_menu = Some(id);
} else {
self.open_menu = Some(old_id);
return Task::none();
}
} else {
return Task::none();
}
let popup_id = self.next_popup_id();
let i = self.menus.keys().position(|&i| i == id).unwrap();

let (i, parent) = self
.overflow_index()
.and_then(|overflow_i| {
if overflow_i <= i {
Some(i - overflow_i).zip(self.overflow_popup)
} else {
Some((i, self.core.main_window_id().unwrap()))
}
})
.unwrap_or((0, self.core.main_window_id().unwrap()));

let mut popup_settings = self
.core
.applet
.get_popup_settings(parent, popup_id, None, None, None);
self.popup = Some(popup_id);

if matches!(
self.core.applet.anchor,
PanelAnchor::Left | PanelAnchor::Right
) {
let suggested_size = self.core.applet.suggested_size(false).1
+ 2 * self.core.applet.suggested_padding(false).1;
popup_settings.positioner.anchor_rect.y = i as i32 * suggested_size as i32;
} else {
let suggested_size = self.core.applet.suggested_size(false).0
+ 2 * self.core.applet.suggested_padding(false).1;
popup_settings.positioner.anchor_rect.x = i as i32 * suggested_size as i32;
}
cmds.push(get_popup(popup_settings));
Task::batch(cmds)
}
Msg::Surface(a) => {
return cosmic::task::message(cosmic::Action::Cosmic(
cosmic::app::Action::Surface(a),
Expand Down