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

Wayland: improve support of screen removal while FLTK runs

Browse Source
This commit is contained in:
ManoloFLTK 2025-03-17 19:02:36 +01:00
parent 622c1f1db8
commit 3f4712957c
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx
View File

@ -1656,6 +1656,7 @@ static int workarea_xywh[4] = { -1, -1, -1, -1 };
void Fl_Wayland_Screen_Driver::init_workarea()
{
wl_display_roundtrip(Fl_Wayland_Screen_Driver::wl_display); // important after screen removal
Fl_Wayland_Screen_Driver::output *output, *mainscreen = NULL;
wl_list_for_each(output, &outputs, link) {
int Wfullscreen, Hfullscreen, Wworkarea, Hworkarea;

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

@ -693,8 +693,6 @@ void change_scale(Fl_Wayland_Screen_Driver::output *output, struct wld_window *w
Fl::add_timeout(0, (Fl_Timeout_Handler)delayed_rescale, window->fl_win);
}
}
if (window->fl_win->as_gl_window())
wl_surface_set_buffer_scale(window->wl_surface, output->wld_scale);
}
@ -710,8 +708,6 @@ static void surface_enter(void *data, struct wl_surface *wl_surface,
if (output == NULL)
return;
Fl_Wayland_Window_Driver *win_driver = Fl_Wayland_Window_Driver::driver(window->fl_win);
float pre_scale = Fl::screen_scale(win_driver->screen_num()) * win_driver->wld_scale();
bool list_was_empty = wl_list_empty(&window->outputs);
struct Fl_Wayland_Window_Driver::surface_output *surface_output =
(struct Fl_Wayland_Window_Driver::surface_output*)malloc(
@ -723,7 +719,7 @@ static void surface_enter(void *data, struct wl_surface *wl_surface,
wl_list_insert(e, &surface_output->link);
//printf("window %p enters screen id=%d length=%d\n", window->fl_win, output->id, wl_list_length(&window->outputs));
if (list_was_empty && !window->fl_win->parent()) {
change_scale(output, window, pre_scale);
change_scale(output, window, 0);
}
}