[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/unx

[Jan Holesovsky]

 vcl/unx/generic/window/salframe.cxx |    2 ++
 vcl/unx/gtk/window/gtkframe.cxx     |    2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 8f6c8cbad65c87b93014aeff7868dc537b8f1a1a
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Dec 14 19:01:44 2011 +0100

    If possible, make the window big enough to fit all Writer toolbars.
    
    [with large icons]

diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index b835a01..20b8b06 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -345,6 +345,8 @@ void X11SalFrame::Init( sal_uLong nSalFrameStyle, int nScreen, SystemParentData*
                     w = 785;
                 if( aScreenSize.Width() >= 1024 )
                     w = 920;
+                if( aScreenSize.Width() >= 1280 )
+                    w = 1050;
 
                 if( aScreenSize.Height() >= 600 )
                     h = 550;
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 0c195d3..a384375 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -1328,6 +1328,8 @@ Size GtkSalFrame::calcDefaultSize()
         w = 785;
     if( aScreenSize.Width() >= 1024 )
         w = 920;
+    if( aScreenSize.Width() >= 1280 )
+        w = 1050;
 
     if( aScreenSize.Height() >= 600 )
         h = 550;