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

Remove unused code from Fl_Wayland_Window_Driver (#1248)

Browse Source 
This commit removes the unused static method

  Fl_Wayland_Window_Driver::resize_after_screen_change(void *data)

and related data as discussed in the context of PR #1248.
This commit is contained in:
Albrecht Schlosser 2025-04-18 18:23:28 +02:00
parent 002b69f8fe
commit 374f22b8bf
2 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/drivers/Wayland/Fl_Wayland_Window_Driver.H
View File

@ -1,7 +1,7 @@
// //
// Definition of Wayland window driver for the Fast Light Tool Kit (FLTK). // Definition of Wayland window driver for the Fast Light Tool Kit (FLTK).
// //
// Copyright 2010-2024 by Bill Spitzak and others. // Copyright 2010-2025 by Bill Spitzak and others.
// //
// This library is free software. Distribution and use rights are outlined in // This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this // the file "COPYING" which should have been included with this file. If this
@ -65,11 +65,7 @@ private:
public: public:
inline Fl_Cursor standard_cursor() { return standard_cursor_; }; inline Fl_Cursor standard_cursor() { return standard_cursor_; };
bool in_handle_configure; // distinguish OS and user window resize bool in_handle_configure; // distinguish OS and user window resize
// --- support for screen-specific scaling factors
struct type_for_resize_window_between_screens {
int screen;
bool busy;
};
struct surface_output { // for linked list of displays where a surface maps struct surface_output { // for linked list of displays where a surface maps
struct Fl_Wayland_Screen_Driver::output *output; struct Fl_Wayland_Screen_Driver::output *output;
struct wl_list link; struct wl_list link;
@ -80,7 +76,6 @@ public:
int hotx, hoty; int hotx, hoty;
}; };
static void delete_cursor(struct custom_cursor *custom, bool delete_rgb = true); static void delete_cursor(struct custom_cursor *custom, bool delete_rgb = true);
static type_for_resize_window_between_screens data_for_resize_window_between_screens_;
void decorated_win_size(int &w, int &h); void decorated_win_size(int &w, int &h);
void shape_bitmap_(Fl_Image* b); void shape_bitmap_(Fl_Image* b);
void shape_alpha_(Fl_Image* img, int offset) FL_OVERRIDE; void shape_alpha_(Fl_Image* img, int offset) FL_OVERRIDE;
@ -98,7 +93,6 @@ public:
static inline Fl_Wayland_Window_Driver* driver(const Fl_Window *w) { static inline Fl_Wayland_Window_Driver* driver(const Fl_Window *w) {
return (Fl_Wayland_Window_Driver*)Fl_Window_Driver::driver(w); return (Fl_Wayland_Window_Driver*)Fl_Window_Driver::driver(w);
} }
static void resize_after_screen_change(void *data);
static Fl_Wayland_Plugin *gl_plugin(); static Fl_Wayland_Plugin *gl_plugin();
// --- window data // --- window data

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

@ -1,7 +1,7 @@
// //
// Implementation of the Wayland window driver. // Implementation of the Wayland window driver.
// //
// Copyright 1998-2024 by Bill Spitzak and others. // Copyright 1998-2025 by Bill Spitzak and others.
// //
// This library is free software. Distribution and use rights are outlined in // This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this // the file "COPYING" which should have been included with this file. If this
@ -1603,18 +1603,6 @@ void Fl_Wayland_Window_Driver::makeWindow()
} }
Fl_Wayland_Window_Driver::type_for_resize_window_between_screens Fl_Wayland_Window_Driver::data_for_resize_window_between_screens_ = {0, false};
void Fl_Wayland_Window_Driver::resize_after_screen_change(void *data) {
Fl_Window *win = (Fl_Window*)data;
float f = Fl::screen_driver()->scale(data_for_resize_window_between_screens_.screen);
Fl_Window_Driver::driver(win)->resize_after_scale_change(
data_for_resize_window_between_screens_.screen, f, f);
data_for_resize_window_between_screens_.busy = false;
}
int Fl_Wayland_Window_Driver::set_cursor(Fl_Cursor c) { int Fl_Wayland_Window_Driver::set_cursor(Fl_Cursor c) {
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();
struct wld_window *xid = (struct wld_window *)Fl_Window_Driver::xid(pWindow); struct wld_window *xid = (struct wld_window *)Fl_Window_Driver::xid(pWindow);