[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - patches/dev300
Radek DoulÃk
rodo at kemper.freedesktop.org
Thu Jul 1 04:54:00 PDT 2010
patches/dev300/vcl-netbook-export-small-screen-mode-m16.diff | 8 ++++----
patches/dev300/vcl-netbook-export-small-screen-mode.diff | 8 ++++----
patches/dev300/vcl-netbook.diff | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit ef3a4cc373ccea3e69b364ac342d6add04f4162c
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-m16.diff b/patches/dev300/vcl-netbook-export-small-screen-mode-m16.diff
index 1531d0f..1d7dbc5 100644
--- a/patches/dev300/vcl-netbook-export-small-screen-mode-m16.diff
+++ b/patches/dev300/vcl-netbook-export-small-screen-mode-m16.diff
@@ -49,8 +49,8 @@ diff -rup vcl-orig/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkframe.cxx
eType = GDK_WINDOW_TYPE_HINT_UTILITY;
}
-- 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 );
@@ -58,8 +58,8 @@ diff -rup vcl-orig/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkframe.cxx
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-export-small-screen-mode.diff b/patches/dev300/vcl-netbook-export-small-screen-mode.diff
index 3721de8..cbc2179 100644
--- a/patches/dev300/vcl-netbook-export-small-screen-mode.diff
+++ b/patches/dev300/vcl-netbook-export-small-screen-mode.diff
@@ -49,8 +49,8 @@ diff -rup vcl-orig/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkframe.cxx
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 );
@@ -58,8 +58,8 @@ diff -rup vcl-orig/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkframe.cxx
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 b8e54d9..934061a 100644
--- a/patches/dev300/vcl-netbook.diff
+++ b/patches/dev300/vcl-netbook.diff
@@ -5,7 +5,7 @@ diff -wrup ../../build-orig/ooo320-m8/vcl/unx/gtk/window/gtkframe.cxx vcl/unx/gt
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 );
@@ -23,7 +23,7 @@ diff -wrup ../../build-orig/ooo320-m8/vcl/unx/gtk/window/gtkframe.cxx vcl/unx/gt
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) &&
More information about the ooo-build-commit
mailing list