[ooo-build-commit] .: patches/dev300

[Radek Doulík]

 patches/dev300/vcl-netbook-export-small-screen-mode.diff |    8 ++++----
 patches/dev300/vcl-netbook.diff                          |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit d6c409d47b225a125332c0c3cebab390d4a1cfb3
Author: Radek Doulik <rodo at novell.com>
Date:   Thu Jul 1 13:47:23 2010 +0200

    be more restrictive when identifying top level document window, fixes n#607735
    
    * patches/dev300/vcl-netbook-export-small-screen-mode-m16.diff:
    * patches/dev300/vcl-netbook-export-small-screen-mode.diff:
    * patches/dev300/vcl-netbook.diff:

diff --git a/patches/dev300/vcl-netbook-export-small-screen-mode.diff b/patches/dev300/vcl-netbook-export-small-screen-mode.diff
index 83984a1..de8f205 100644
--- a/patches/dev300/vcl-netbook-export-small-screen-mode.diff
+++ b/patches/dev300/vcl-netbook-export-small-screen-mode.diff
@@ -61,8 +61,8 @@ index c26d85c..6426611 100644
              gtk_window_set_keep_above( GTK_WINDOW(m_pWindow), true );
          }
          
--    if( getDisplay()->getWMAdaptor()->getSmallScreen() && eWinType == GTK_WINDOW_TOPLEVEL && !(nStyle & SAL_FRAME_STYLE_DIALOG ) )
-+    if( GetSmallScreenMode() && eWinType == GTK_WINDOW_TOPLEVEL && !(nStyle & SAL_FRAME_STYLE_DIALOG ) )
+-    if( getDisplay()->getWMAdaptor()->getSmallScreen() && eWinType == GTK_WINDOW_TOPLEVEL && !(nStyle & SAL_FRAME_STYLE_DIALOG ) && !(nStyle & SAL_FRAME_STYLE_FLOAT_FOCUSABLE ) && !(nStyle & SAL_FRAME_STYLE_TOOLWINDOW ) )
++    if( GetSmallScreenMode() && eWinType == GTK_WINDOW_TOPLEVEL && !(nStyle & SAL_FRAME_STYLE_DIALOG ) && !(nStyle & SAL_FRAME_STYLE_FLOAT_FOCUSABLE ) && !(nStyle & SAL_FRAME_STYLE_TOOLWINDOW ) )
          bNoDecor = true;
  
          gtk_window_set_type_hint( GTK_WINDOW(m_pWindow), eType );
@@ -70,8 +70,8 @@ index c26d85c..6426611 100644
          SAL_FRAMESTATE_MASK_MAXIMIZED_X | SAL_FRAMESTATE_MASK_MAXIMIZED_Y |
          SAL_FRAMESTATE_MASK_MAXIMIZED_WIDTH | SAL_FRAMESTATE_MASK_MAXIMIZED_HEIGHT;
      
--    if( getDisplay()->getWMAdaptor()->getSmallScreen() && !(m_nStyle & SAL_FRAME_STYLE_DIALOG) )
-+    if( GetSmallScreenMode() && !(m_nStyle & SAL_FRAME_STYLE_DIALOG) )
+-    if( getDisplay()->getWMAdaptor()->getSmallScreen() && !(m_nStyle & SAL_FRAME_STYLE_DIALOG) && !(m_nStyle & SAL_FRAME_STYLE_FLOAT_FOCUSABLE ) && !(m_nStyle & SAL_FRAME_STYLE_TOOLWINDOW ) )
++    if( GetSmallScreenMode() && !(m_nStyle & SAL_FRAME_STYLE_DIALOG) && !(m_nStyle & SAL_FRAME_STYLE_FLOAT_FOCUSABLE ) && !(m_nStyle & SAL_FRAME_STYLE_TOOLWINDOW ) )
        gtk_window_maximize( GTK_WINDOW(m_pWindow) );
      else {
      if( (pState->mnMask & SAL_FRAMESTATE_MASK_STATE) &&
diff --git a/patches/dev300/vcl-netbook.diff b/patches/dev300/vcl-netbook.diff
index ad3c589..de3d72e 100644
--- a/patches/dev300/vcl-netbook.diff
+++ b/patches/dev300/vcl-netbook.diff
@@ -13,7 +13,7 @@ index d47d16a..c26d85c 100644
              gtk_window_set_keep_above( GTK_WINDOW(m_pWindow), true );
          }
          
-+    if( getDisplay()->getWMAdaptor()->getSmallScreen() && eWinType == GTK_WINDOW_TOPLEVEL && !(nStyle & SAL_FRAME_STYLE_DIALOG ) )
++    if( getDisplay()->getWMAdaptor()->getSmallScreen() && eWinType == GTK_WINDOW_TOPLEVEL && !(nStyle & SAL_FRAME_STYLE_DIALOG ) && !(nStyle & SAL_FRAME_STYLE_FLOAT_FOCUSABLE ) && !(nStyle & SAL_FRAME_STYLE_TOOLWINDOW ) )
 +        bNoDecor = true;
 +
          gtk_window_set_type_hint( GTK_WINDOW(m_pWindow), eType );
@@ -31,7 +31,7 @@ index d47d16a..c26d85c 100644
          SAL_FRAMESTATE_MASK_MAXIMIZED_X | SAL_FRAMESTATE_MASK_MAXIMIZED_Y |
          SAL_FRAMESTATE_MASK_MAXIMIZED_WIDTH | SAL_FRAMESTATE_MASK_MAXIMIZED_HEIGHT;
      
-+    if( getDisplay()->getWMAdaptor()->getSmallScreen() && !(m_nStyle & SAL_FRAME_STYLE_DIALOG) )
++    if( getDisplay()->getWMAdaptor()->getSmallScreen() && !(m_nStyle & SAL_FRAME_STYLE_DIALOG) && !(m_nStyle & SAL_FRAME_STYLE_FLOAT_FOCUSABLE ) && !(m_nStyle & SAL_FRAME_STYLE_TOOLWINDOW ) )
 +      gtk_window_maximize( GTK_WINDOW(m_pWindow) );
 +    else {
      if( (pState->mnMask & SAL_FRAMESTATE_MASK_STATE) &&