gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for #1260 - part 4: fix when menu button is in subwindow under Wayland

Browse Source
This commit is contained in:
ManoloFLTK 2025-05-30 21:38:13 +02:00
parent c13594f999
commit 9a5e3b95b8
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx
View File

@ -1170,12 +1170,13 @@ static void popup_configure(void *data, struct xdg_popup *xdg_popup, int32_t x,
// make selected item visible, if there's one
Fl_Window_Driver::scroll_to_selected_item(window->fl_win);
}
if (Fl_Window_Driver::current_menu_button && !Fl_Window_Driver::menu_leftorigin(window->fl_win) &&
y < Fl_Window_Driver::current_menu_button->y()) {
if (Fl_Window_Driver::current_menu_button && !Fl_Window_Driver::menu_leftorigin(window->fl_win)) {
int X, Y;
Fl_Window_Driver::current_menu_button->top_window_offset(X, Y);
if (y < Y) {
Fl_Window *win = window->fl_win;
int Y = win->y();
win->Fl_Widget::resize(win->x(), Y - win->h() - Fl_Window_Driver::current_menu_button->h(),
win->w(), win->h());
win->Fl_Widget::resize(win->x(), Y - win->h(), win->w(), win->h());
}
}
}
@ -1334,12 +1335,12 @@ bool Fl_Wayland_Window_Driver::process_menu_or_tooltip(struct wld_window *new_wi
//xdg_positioner_get_version(positioner) <== gives 1 under Debian and Sway
int popup_x, popup_y;
if (Fl_Window_Driver::current_menu_button && !Fl_Window_Driver::menu_leftorigin(pWindow)) {
xdg_positioner_set_anchor_rect(positioner,
Fl_Window_Driver::current_menu_button->x() * f,
Fl_Window_Driver::current_menu_button->y() * f,
int X, Y;
Fl_Window_Driver::current_menu_button->top_window_offset(X, Y);
xdg_positioner_set_anchor_rect(positioner, X * f, Y * f,
Fl_Window_Driver::current_menu_button->w() * f,
Fl_Window_Driver::current_menu_button->h() * f);
popup_x = Fl_Window_Driver::current_menu_button->x() * f;
popup_x = X * f;
popup_y = 0;
if (parent_xid->kind == Fl_Wayland_Window_Driver::DECORATED && !origin_win->fullscreen_active())
libdecor_frame_translate_coordinate(parent_xid->frame, popup_x, popup_y,