From 818e2b77d141574a8ef8cf50bbe33241206a2ee9 Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Fri, 1 Nov 2024 15:43:18 +0100 Subject: Wayland: Fix issue in maximization of a borderless window (#1099) Also fixes scenarios mixing fullscreen and maximization: - maximize - set fullscreen - unset fullscreen - un-maximize with and without window border. --- test/fullscreen.cxx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'test/fullscreen.cxx') diff --git a/test/fullscreen.cxx b/test/fullscreen.cxx index 32cc95582..00a15da72 100644 --- a/test/fullscreen.cxx +++ b/test/fullscreen.cxx @@ -183,14 +183,13 @@ void border_cb(Fl_Button *b, Fl_Window *w) { } -void maximize_cb(Fl_Widget *o, void *p) { - Fl_Window *w = (Fl_Window *)p; +void maximize_cb(Fl_Button *b, Fl_Window *w) { if (w->maximize_active()) { w->un_maximize(); - //((Fl_Button*)o)->set(); + if (w->maximize_active()) b->set(); } else { w->maximize(); - //((Fl_Button*)o)->clear(); + if (!w->maximize_active()) b->clear(); } } @@ -349,7 +348,7 @@ int main(int argc, char **argv) { y+=30; window.b3_maxi = new Fl_Toggle_Light_Button(50,y,window.w()-60,30,"Maximize"); - window.b3_maxi->callback(maximize_cb,w); + window.b3_maxi->callback((Fl_Callback*)maximize_cb,w); y+=30; window.b4 = new Fl_Toggle_Light_Button(50,y,window.w()-60,30,"All Screens"); -- cgit v1.2.3