summaryrefslogtreecommitdiff
path: root/src/Fl_Group.cxx
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2017-07-25 10:57:24 +0000
committerManolo Gouy <Manolo>2017-07-25 10:57:24 +0000
commit225c3d6da316838aba9432a319bbdd33da97a001 (patch)
tree02d987786b068b2fb0918e62588233cf9543da13 /src/Fl_Group.cxx
parent2b529dc25d51b58eed4215e6794de470e2f9deab (diff)
Rewrite Fl_Window_Driver::resize_after_scale_change() removing calls to Fl_Window::hide() and Fl_Window::show().
Windows are now rescaled with a call to Fl_Window::resize() which has been slightly modified. Static member variable bool Fl_Window_Driver::in_resize_after_scale_change is created, and is true if and only if Fl_Window::resize() is called by Fl_Window_Driver::resize_after_scale_change(). This new flag allows Fl_Window::resize() to perform correctly the rescaling of the window. Fl_Gl_Window::resize() and Fl_Double_Window::resize() also consult the value of the Fl_Window_Driver::in_resize_after_scale_change flag. The platform-specific Fl_WinAPI_Window_Driver::resize() and Fl_X11_Window_Driver::resize() also use the Fl_Window_Driver::in_resize_after_scale_change flag. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12349 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Group.cxx')
-rw-r--r--src/Fl_Group.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Fl_Group.cxx b/src/Fl_Group.cxx
index 34049a53d..f359152f5 100644
--- a/src/Fl_Group.cxx
+++ b/src/Fl_Group.cxx
@@ -25,6 +25,7 @@
#include <FL/Fl.H>
#include <FL/Fl_Group.H>
#include <FL/Fl_Window.H>
+#include <FL/Fl_Window_Driver.H>
#include <FL/fl_draw.H>
#include <stdlib.h>
@@ -699,7 +700,7 @@ void Fl_Group::resize(int X, int Y, int W, int H) {
Fl_Widget::resize(X,Y,W,H); // make new xywh values visible for children
- if (!resizable() || (dw==0 && dh==0) ) {
+ if ((!resizable() || (dw==0 && dh==0 )) && !Fl_Window_Driver::in_resize_after_scale_change) {
if (!as_window()) {
Fl_Widget*const* a = array();