juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 11:23:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix wxGTK submenu popup parenting and sizing on Wayland (#13707)

Browse Source
This commit is contained in:
Thomas Henauer
2026-05-18 12:01:19 +02:00
committed by GitHub
parent ddeaa4ba82
commit 6e4f7ff172
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/slic3r/GUI/Widgets/DropDown.cpp
View File

@@ -564,11 +564,6 @@ void DropDown::messureSize()
subDropDown->use_content_width = true; subDropDown->use_content_width = true;
subDropDown->Create(GetParent()); subDropDown->Create(GetParent());
#ifdef __WXGTK__ #ifdef __WXGTK__
// Orca: Keep the wx parent as the combobox so wxPopupTransientWindow installs
// its capture handlers on the main dropdown, but make the native GTK
// popup transient for the currently open popup to satisfy Wayland's
// xdg-shell rule that a popup's parent must be the topmost mapped popup.
gtk_window_set_transient_for(GTK_WINDOW(subDropDown->GetHandle()), GTK_WINDOW(GetHandle()));
// Orca: On Wayland, while the sub holds an xdg_popup grab, motion events for // Orca: On Wayland, while the sub holds an xdg_popup grab, motion events for
// the cursor over main may not be delivered (Mutter drops motion // the cursor over main may not be delivered (Mutter drops motion
// outside the grabbing surface). Poll on idle and synthesize a // outside the grabbing surface). Poll on idle and synthesize a
@@ -636,8 +631,11 @@ void DropDown::autoPosition()
// may exceed // may exceed
auto drect = wxDisplay(GetParent()).GetGeometry(); auto drect = wxDisplay(GetParent()).GetGeometry();
if (GetPosition().y + size.y + 10 > drect.GetBottom()) { if (GetPosition().y + size.y + 10 > drect.GetBottom()) {
int available_height = drect.GetBottom() - GetPosition().y - 10;
if (available_height < rowSize.y * 2)
return;
if (use_content_width && count <= 15) size.x += 6; if (use_content_width && count <= 15) size.x += 6;
size.y = drect.GetBottom() - GetPosition().y - 10; size.y = available_height;
wxWindow::SetSize(size); wxWindow::SetSize(size);
if (selection >= 0) { if (selection >= 0) {
if (offset.y + rowSize.y * (selection + 1) > size.y) if (offset.y + rowSize.y * (selection + 1) > size.y)
@@ -727,6 +725,13 @@ void DropDown::mouseMove(wxMouseEvent &event)
drop.group = items[-index - 2].group_key; drop.group = items[-index - 2].group_key;
drop.need_sync = true; drop.need_sync = true;
drop.messureSize(); drop.messureSize();
#ifdef __WXGTK__
// wxGTK wraps popup contents in a native GtkWindow. Make the submenu
// transient for the currently mapped parent popup window before
// positioning/showing it, so wlroots/Hyprland sees the topmost parent.
if (m_widget && drop.m_widget)
gtk_window_set_transient_for(GTK_WINDOW(drop.m_widget), GTK_WINDOW(m_widget));
#endif
drop.autoPosition(); drop.autoPosition();
drop.paintNow(); drop.paintNow();
if (!drop.IsShown()) if (!drop.IsShown())