diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2024-03-19 15:09:14 +0100 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2024-03-19 15:39:18 +0100 |
| commit | af90841fbc0a7090d7f3979c4d71aeeec1fbcb4b (patch) | |
| tree | 8c768ffc47e08b5031110997b595e930e3e1a754 /src/drivers | |
| parent | 3a8daf70c05692d73ded3a64d004a685c5ea2df6 (diff) | |
Update dependencies, whitespace, and Fl_File_Chooser.cxx
Rewrite src/Fl_File_Chooser.cxx from its .fl source file
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.cxx | 2 | ||||
| -rw-r--r-- | src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.cxx index 5241f2375..8c14912f2 100644 --- a/src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.cxx +++ b/src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.cxx @@ -409,7 +409,7 @@ void Fl_Wayland_Gl_Window_Driver::resize(int is_a_resize, int W, int H) { struct wld_window *xid = fl_wl_xid(pWindow); if (xid->kind == Fl_Wayland_Window_Driver::DECORATED && !xid->frame_cb) { xid->frame_cb = wl_surface_frame(xid->wl_surface); - wl_callback_add_listener(xid->frame_cb, + wl_callback_add_listener(xid->frame_cb, Fl_Wayland_Graphics_Driver::p_surface_frame_listener, xid); } wl_egl_window_resize(egl_window, W, H, 0, 0); diff --git a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx index 2aa080375..92e04d578 100644 --- a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx +++ b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx @@ -1498,7 +1498,7 @@ int Fl_Wayland_Window_Driver::set_cursor(Fl_Cursor c) { // Cursor names are the files of directory /usr/share/icons/XXXX/cursors/ // where XXXX is the name of the current 'cursor theme'. static struct cursor_file_struct { - Fl_Cursor c; + Fl_Cursor c; const char *fname; Fl_Wayland_Screen_Driver::cursor_shapes wld_c; } cursor_file_array[] = { @@ -1522,7 +1522,7 @@ int Fl_Wayland_Window_Driver::set_cursor(Fl_Cursor c) { {FL_CURSOR_NESW, "fd_double_arrow", Fl_Wayland_Screen_Driver::nesw }, {FL_CURSOR_NWSE, "bd_double_arrow", Fl_Wayland_Screen_Driver::nwse } }; - + int found = -1; for (unsigned i = 0; i < sizeof(cursor_file_array) / sizeof(struct cursor_file_struct); i++) { if (cursor_file_array[i].c == c) { @@ -1536,7 +1536,7 @@ int Fl_Wayland_Window_Driver::set_cursor(Fl_Cursor c) { } } if (found < 0 || !scr_driver->xc_cursor[found]) return 0; - + if (xid->custom_cursor) { delete_cursor(xid->custom_cursor); xid->custom_cursor = NULL; @@ -1781,7 +1781,7 @@ void Fl_Wayland_Window_Driver::resize(int X, int Y, int W, int H) { if (fl_win && fl_win->kind == SUBWINDOW && fl_win->subsurface) checkSubwindowFrame(); // make sure subwindow doesn't leak outside parent - + if (Fl_Wayland_Screen_Driver::compositor == Fl_Wayland_Screen_Driver::MUTTER && fl_win && is_a_resize && fl_win->kind == DECORATED) { // fix for issue #878 scan_subwindows(pWindow, does_window_cover_parent); |
