diff options
| -rw-r--r-- | src/Fl_Window_Driver.cxx | 6 | ||||
| -rw-r--r-- | src/Fl_x.cxx | 21 |
2 files changed, 6 insertions, 21 deletions
diff --git a/src/Fl_Window_Driver.cxx b/src/Fl_Window_Driver.cxx index 982341e2f..f0fc76a89 100644 --- a/src/Fl_Window_Driver.cxx +++ b/src/Fl_Window_Driver.cxx @@ -2,7 +2,7 @@ // A base class for platform specific window handling code // for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2022 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 // the file "COPYING" which should have been included with this file. If this @@ -289,13 +289,13 @@ void Fl_Window_Driver::maximize() { int dh = (height - h() - dw); bool need_hide_show = maximize_needs_hide(); if (need_hide_show) hide(); // pb may occur in subwindow without this - resize(X + dw/2, Y + dh + dw/2, W - dw, H - dh - dw); + pWindow->resize(X + dw/2, Y + dh + dw/2, W - dw, H - dh - dw); if (need_hide_show) show(); } void Fl_Window_Driver::un_maximize() { - resize(*no_fullscreen_x(), *no_fullscreen_y(), + pWindow->resize(*no_fullscreen_x(), *no_fullscreen_y(), *no_fullscreen_w(), *no_fullscreen_h()); *no_fullscreen_x() = 0; *no_fullscreen_y() = 0; diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx index 7d285d0b4..3193024ce 100644 --- a/src/Fl_x.cxx +++ b/src/Fl_x.cxx @@ -1,7 +1,7 @@ // // X specific code for the Fast Light Tool Kit (FLTK). // -// 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 // the file "COPYING" which should have been included with this file. If this @@ -2494,17 +2494,7 @@ void Fl_X11_Window_Driver::maximize() { send_wm_event(fl_xid(pWindow), fl_NET_WM_STATE, _NET_WM_STATE_ADD, fl_NET_WM_STATE_MAXIMIZED_VERT, fl_NET_WM_STATE_MAXIMIZED_HORZ); } else { - *no_fullscreen_x() = x(); - *no_fullscreen_y() = y(); - *no_fullscreen_w() = w(); - *no_fullscreen_h() = h(); - int X,Y,W,H; - Fl::screen_work_area(X, Y, W, H, screen_num()); - int width, height; - decorated_win_size(width, height); - int dw = (width - w()); - int dh = (height - h() - dw); - resize(X + dw/2, Y + dh + dw/2, W - dw, H - dh - dw); + Fl_Window_Driver::maximize(); } } @@ -2513,12 +2503,7 @@ void Fl_X11_Window_Driver::un_maximize() { send_wm_event(fl_xid(pWindow), fl_NET_WM_STATE, _NET_WM_STATE_REMOVE, fl_NET_WM_STATE_MAXIMIZED_VERT, fl_NET_WM_STATE_MAXIMIZED_HORZ); } else { - resize(*no_fullscreen_x(), *no_fullscreen_y(), - *no_fullscreen_w(), *no_fullscreen_h()); - *no_fullscreen_x() = 0; - *no_fullscreen_y() = 0; - *no_fullscreen_w() = 0; - *no_fullscreen_h() = 0; + Fl_Window_Driver::un_maximize(); } } |