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

fix(desktop): use the window id for context menus

Browse source
This commit is contained in:
Ashley Wulber 2025-07-25 14:11:39 -04:00 • committed by Ashley Wulber
parent a6e369df0f
commit 6d9e6c1d20
3 changed files with 66 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/dialog.rs
View file

@ -945,7 +945,7 @@ impl Application for App {
},
});
let mut tab = Tab::new(location, flags.config.dialog_tab(), None);
let mut tab = Tab::new(location, flags.config.dialog_tab(), None, None);
tab.mode = tab::Mode::Dialog(flags.kind.clone());
tab.sort_name = tab::HeadingOptions::Modified;
tab.sort_direction = false;
@ -1239,7 +1239,7 @@ impl Application for App {
}
if self.tab.context_menu.is_some() {
return self.update(Message::TabMessage(tab::Message::ContextMenu(None)));
return self.update(Message::TabMessage(tab::Message::ContextMenu(None, None)));
}
if self.tab.edit_location.is_some() {
@ -1605,7 +1605,7 @@ impl Application for App {
tab::Command::ChangeLocation(_tab_title, _tab_path, _selection_paths) => {
commands.push(Task::batch([self.update_watcher(), self.rescan_tab()]));
}
tab::Command::ContextMenu(point_opt) => {
tab::Command::ContextMenu(point_opt, parent_id) => {
#[cfg(feature = "wayland")]
match point_opt {
Some(point) => {
@ -1639,7 +1639,8 @@ impl Application for App {
..Default::default()
};
SctkPopupSettings {
parent: app.flags.window_id,
parent: parent_id
.unwrap_or(app.flags.window_id),
id: window_id,
positioner,
parent_size: None,