From 18a902ca3169970a39e3c183aece8fe076f0e260 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Mon, 30 May 2011 12:33:51 +0000
Subject: 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
---
 src/Fl_cocoa.mm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/Fl_cocoa.mm')

diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index 11183401a..0df97c934 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -3392,7 +3392,7 @@ Window fl_xid(const Fl_Window* w)
 
 int Fl_Window::decorated_w()
 {
-  if (parent() || !border()) return w();
+  if (!shown() || parent() || !border() || !visible()) return w();
   int bx, by, bt;
   get_window_frame_sizes(bx, by, bt);
   return w() + 2 * bx;
@@ -3400,7 +3400,7 @@ int Fl_Window::decorated_w()
 
 int Fl_Window::decorated_h()
 {
-  if (parent() || !border()) return h();
+  if (!shown() || parent() || !border() || !visible()) return h();
   int bx, by, bt;
   get_window_frame_sizes(bx, by, bt);
   return h() + bt + by;
@@ -3408,7 +3408,7 @@ int Fl_Window::decorated_h()
 
 void Fl_Paged_Device::print_window(Fl_Window *win, int x_offset, int y_offset)
 {
-  if (!win->shown() || win->parent() || !win->border()) {
+  if (!win->shown() || win->parent() || !win->border() || !win->visible()) {
     this->print_widget(win, x_offset, y_offset);
     return;
   }
-- 
cgit v1.2.3