diff options
| author | Manolo Gouy <Manolo> | 2011-05-30 12:33:51 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2011-05-30 12:33:51 +0000 |
| commit | 18a902ca3169970a39e3c183aece8fe076f0e260 (patch) | |
| tree | 717f37482dfd076c87593ca258022132e2b9b3b9 /src/Fl_win32.cxx | |
| parent | 39998a972c3cb873e2fb29bfc1b9532cac45919e (diff) | |
Fix Fl_Paged_Device::print_window(), Fl_Window::decorated_w() and Fl_Window::decorated_h()
when the window is iconized for all platforms.
Also, factorized some duplicated code in src/Fl_x.cxx.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8759 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_win32.cxx')
| -rw-r--r-- | src/Fl_win32.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index d4530467b..f6fcc6ce5 100644 --- a/src/Fl_win32.cxx +++ b/src/Fl_win32.cxx @@ -1966,7 +1966,7 @@ Window fl_xid_(const Fl_Window *w) { int Fl_Window::decorated_w() { - if (parent() || !shown()) return w(); + if (!shown() || parent() || !border() || !visible()) return w(); int X, Y, bt, bx, by; Fl_X::fake_X_wm(this, X, Y, bt, bx, by); return w() + 2 * bx; @@ -1974,7 +1974,7 @@ int Fl_Window::decorated_w() int Fl_Window::decorated_h() { - if (this->parent() || !shown()) return h(); + if (!shown() || parent() || !border() || !visible()) return h(); int X, Y, bt, bx, by; Fl_X::fake_X_wm(this, X, Y, bt, bx, by); return h() + bt + 2 * by; @@ -1982,7 +1982,7 @@ int Fl_Window::decorated_h() void Fl_Paged_Device::print_window(Fl_Window *win, int x_offset, int y_offset) { - if (win->parent() || !win->border()) { + if (!win->shown() || win->parent() || !win->border() || !win->visible()) { this->print_widget(win, x_offset, y_offset); return; } |