Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-01 23:06:54 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

New static member Fl_Window *Fl_Wayland_Window_Driver::previous_floatingtitle

Browse Source
This commit is contained in:
ManoloFLTK
2023-01-12 11:58:53 +01:00
parent 62e33973a1
commit b375d07d32
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/Wayland/Fl_Wayland_Window_Driver.H
+2
View File
@@ -129,6 +129,8 @@ public:
void reposition_menu_window(int x, int y) FL_OVERRIDE; void reposition_menu_window(int x, int y) FL_OVERRIDE;
void menu_window_area(int &X, int &Y, int &W, int &H, int nscreen = -1) FL_OVERRIDE; void menu_window_area(int &X, int &Y, int &W, int &H, int nscreen = -1) FL_OVERRIDE;
static bool tall_popup; // to support tall menu buttons static bool tall_popup; // to support tall menu buttons
bool process_menu_or_tooltip(struct wld_window *);
static Fl_Window *previous_floatingtitle; // to support floating menuwindow w/ title
}; };
src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx
+4 -5
View File
@@ -58,6 +58,8 @@ Window fl_window = 0;
struct wld_window *Fl_Wayland_Window_Driver::wld_window = NULL; struct wld_window *Fl_Wayland_Window_Driver::wld_window = NULL;
bool Fl_Wayland_Window_Driver::tall_popup = false; // to support tall menu buttons bool Fl_Wayland_Window_Driver::tall_popup = false; // to support tall menu buttons
// A menutitle to be mapped later as the child of a menuwindow
Fl_Window *Fl_Wayland_Window_Driver::previous_floatingtitle = NULL;
void Fl_Wayland_Window_Driver::destroy_double_buffer() { void Fl_Wayland_Window_Driver::destroy_double_buffer() {
@@ -1004,7 +1006,7 @@ static const char *get_prog_name() {
a submenu window and that don't belong to an Fl_Menu_Bar are processed differently: a submenu window and that don't belong to an Fl_Menu_Bar are processed differently:
the menuwindow is mapped first, and the menutitle is mapped second above it as a child popup. the menuwindow is mapped first, and the menutitle is mapped second above it as a child popup.
Fl_Window_Driver::is_floating_title() detects when such a menutitle is created, Fl_Window_Driver::is_floating_title() detects when such a menutitle is created,
global variable previous_floatingtitle is assigned the value of this menutitle, and static member variable previous_floatingtitle is assigned the value of this menutitle, and
the menutitle is mapped only after the menuwindow has been mapped, as a child of it. the menutitle is mapped only after the menuwindow has been mapped, as a child of it.
This positions the popup group in the display better in relation to where the popup This positions the popup group in the display better in relation to where the popup
was created. was created.
@@ -1023,14 +1025,11 @@ static const char *get_prog_name() {
item, when there's one, is visible. item, when there's one, is visible.
*/ */
// A menutitle to be mapped later as the child of a menuwindow
static Fl_Window *previous_floatingtitle = NULL;
static bool process_menu_or_tooltip(struct wld_window *new_window) { bool Fl_Wayland_Window_Driver::process_menu_or_tooltip(struct wld_window *new_window) {
// a menu window or tooltip // a menu window or tooltip
new_window->kind = Fl_Wayland_Window_Driver::POPUP; new_window->kind = Fl_Wayland_Window_Driver::POPUP;
Fl_Wayland_Screen_Driver *scr_driver = (Fl_Wayland_Screen_Driver*)Fl::screen_driver(); Fl_Wayland_Screen_Driver *scr_driver = (Fl_Wayland_Screen_Driver*)Fl::screen_driver();
Fl_Window *pWindow = new_window->fl_win;
new_window->xdg_surface = xdg_wm_base_get_xdg_surface(scr_driver->xdg_wm_base, new_window->wl_surface); new_window->xdg_surface = xdg_wm_base_get_xdg_surface(scr_driver->xdg_wm_base, new_window->wl_surface);
xdg_surface_add_listener(new_window->xdg_surface, &xdg_surface_listener, new_window); xdg_surface_add_listener(new_window->xdg_surface, &xdg_surface_listener, new_window);
if (Fl_Window_Driver::is_floating_title(pWindow)) { if (Fl_Window_Driver::is_floating_title(pWindow)) {