[ooo-build-commit] .: patches/dev300
Radek DoulÃk
rodo at kemper.freedesktop.org
Thu Feb 11 07:13:52 PST 2010
patches/dev300/apply | 6
patches/dev300/framework-netbook-use-small-screen-mode.diff | 13 +
patches/dev300/vcl-netbook-export-small-screen-mode.diff | 86 ++++++++++++
3 files changed, 103 insertions(+), 2 deletions(-)
New commits:
commit de1eaa6af2d73cae4c22e646f2354b14a150fff7
Author: Radek Doulik <rodo at novell.com>
Date: Thu Feb 11 16:11:41 2010 +0100
export small screen mode flag outside of vcl
- also move Netbook section to LinuxCommon now as the close button appearance is not hardcoded anymore
* patches/dev300/apply:
* patches/dev300/framework-netbook-use-small-screen-mode.diff:
* patches/dev300/vcl-netbook-export-small-screen-mode.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 118f3a4..cc6065c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -23,7 +23,7 @@ Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
LinuxCommon : Common, Defaults, TangoIcons, FontConfigTemporaryHacks, \
FedoraLinuxOnlyFixes, LinuxOnly, SystemBits, \
msaccess, OpenGLTransitions, \
- Fpickers, Mono, AddressBooks, QuickStarter, KDE4
+ Fpickers, Mono, AddressBooks, QuickStarter, KDE4, Netbook
MacOSXCommon : Common, Defaults, TangoIcons, SystemBits
Win32Common : Common, Defaults, TangoIcons, \
Win32Only, NotDebian, BuildFixWin32
@@ -35,7 +35,7 @@ Experimental: VBAUntested, ArkOnlyExperimental, \
KDE4Experimental, MinGW, CalcExperimental, \
OOXMLExportExperimental, CrossWin32Patches, AutoLayout, \
WriterNavigation, WriterDocComparison, SystemGraphiteWithSTLport, \
- HPPA, Speed, Netbook
+ HPPA, Speed
DebianLooseSections: DebianBaseNoHelpContent
# Optional sections
Optional : LiberationFontsOnWindows, NovellOnlyExtensionFixes, Win32OnlyExtensionFixes, Linux32OnlyExtensionFixes
@@ -3557,6 +3557,8 @@ oowintool-java6.diff, fridrich
[ Netbook ]
vcl-netbook.diff, rodo
framework-netbook.diff, rodo
+vcl-netbook-export-small-screen-mode.diff
+framework-netbook-use-small-screen-mode.diff
[ Fixes ]
svx-sound.diff, n#515553, rodo
diff --git a/patches/dev300/framework-netbook-use-small-screen-mode.diff b/patches/dev300/framework-netbook-use-small-screen-mode.diff
new file mode 100644
index 0000000..1a43958
--- /dev/null
+++ b/patches/dev300/framework-netbook-use-small-screen-mode.diff
@@ -0,0 +1,13 @@
+diff -rup framework-orig/source/layoutmanager/layoutmanager.cxx framework/source/layoutmanager/layoutmanager.cxx
+--- framework-orig/source/layoutmanager/layoutmanager.cxx 2010-02-11 10:35:54.000000000 +0100
++++ framework/source/layoutmanager/layoutmanager.cxx 2010-02-11 10:41:54.000000000 +0100
+@@ -6074,8 +6074,7 @@ void LayoutManager::implts_updateMenuBar
+ if ( pMenuBar )
+ {
+ // TODO remove link on FALSE ?!
+- // TODO: override only when we are in small screen mode to not modify old behaviour
+- if ( TRUE /*bShowCloser*/ )
++ if ( pWindow->GetSmallScreenMode() || bShowCloser )
+ {
+ pMenuBar->ShowCloser( TRUE );
+ pMenuBar->SetCloserHdl( LINK( this, LayoutManager, MenuBarClose ));
diff --git a/patches/dev300/vcl-netbook-export-small-screen-mode.diff b/patches/dev300/vcl-netbook-export-small-screen-mode.diff
new file mode 100644
index 0000000..1531d0f
--- /dev/null
+++ b/patches/dev300/vcl-netbook-export-small-screen-mode.diff
@@ -0,0 +1,86 @@
+diff -rup vcl-orig/inc/vcl/salframe.hxx vcl/inc/vcl/salframe.hxx
+--- vcl-orig/inc/vcl/salframe.hxx 2010-02-11 10:05:50.000000000 +0100
++++ vcl/inc/vcl/salframe.hxx 2010-02-11 10:05:53.000000000 +0100
+@@ -295,6 +295,8 @@ public:
+ // (e.g. input methods, printer update handlers).
+ long CallCallback( USHORT nEvent, const void* pEvent ) const
+ { return m_pProc ? m_pProc( m_pWindow, const_cast<SalFrame*>(this), nEvent, pEvent ) : 0; }
++
++ virtual BOOL GetSmallScreenMode() { return FALSE; }
+ };
+
+
+diff -rup vcl-orig/inc/vcl/window.hxx vcl/inc/vcl/window.hxx
+--- vcl-orig/inc/vcl/window.hxx 2010-02-11 10:05:50.000000000 +0100
++++ vcl/inc/vcl/window.hxx 2010-02-11 10:39:08.000000000 +0100
+@@ -1159,6 +1159,8 @@ public:
+
+ virtual XubString GetSurroundingText() const;
+ virtual Selection GetSurroundingTextSelection() const;
++
++ BOOL GetSmallScreenMode();
+ };
+
+
+diff -rup vcl-orig/source/window/window3.cxx vcl/source/window/window3.cxx
+--- vcl-orig/source/window/window3.cxx 2010-02-11 10:05:44.000000000 +0100
++++ vcl/source/window/window3.cxx 2010-02-11 10:41:33.000000000 +0100
+@@ -37,6 +37,7 @@
+ #include "vcl/window.h"
+ #include "vcl/window.hxx"
+ #include "vcl/waitobj.hxx"
++#include "vcl/salframe.hxx"
+ #include "vcl/salgdi.hxx"
+ #include "vcl/salnativewidgets.hxx"
+ #include "vcl/salctrlhandle.hxx"
+@@ -336,3 +337,8 @@ void Window::ImplAdjustNWFSizes()
+ break;
+ }
+ }
++
++BOOL Window::GetSmallScreenMode()
++{
++ return ImplGetFrame()->GetSmallScreenMode();
++}
+diff -rup vcl-orig/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkframe.cxx
+--- vcl-orig/unx/gtk/window/gtkframe.cxx 2010-02-11 10:05:41.000000000 +0100
++++ vcl/unx/gtk/window/gtkframe.cxx 2010-02-11 10:08:14.000000000 +0100
+@@ -842,7 +842,7 @@ void GtkSalFrame::Init( SalFrame* pParen
+ 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 ) )
+ bNoDecor = true;
+
+ gtk_window_set_type_hint( GTK_WINDOW(m_pWindow), eType );
+@@ -1617,7 +1617,7 @@ void GtkSalFrame::SetWindowState( const
+ 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) )
+ gtk_window_maximize( GTK_WINDOW(m_pWindow) );
+ else {
+ if( (pState->mnMask & SAL_FRAMESTATE_MASK_STATE) &&
+@@ -3732,3 +3732,8 @@ gboolean GtkSalFrame::IMHandler::signalI
+
+ return FALSE;
+ }
++
++BOOL GtkSalFrame::GetSmallScreenMode()
++{
++ return getDisplay()->getWMAdaptor()->getSmallScreen();
++}
+diff -rup vcl-orig/unx/inc/plugins/gtk/gtkframe.hxx vcl/unx/inc/plugins/gtk/gtkframe.hxx
+--- vcl-orig/unx/inc/plugins/gtk/gtkframe.hxx 2010-02-11 10:05:42.000000000 +0100
++++ vcl/unx/inc/plugins/gtk/gtkframe.hxx 2010-02-11 10:07:02.000000000 +0100
+@@ -394,6 +394,8 @@ public:
+ virtual void EndSetClipRegion();
+
+ static GtkSalFrame *getFromWindow( GtkWindow *pWindow );
++
++ virtual BOOL GetSmallScreenMode();
+ };
+
+
More information about the ooo-build-commit
mailing list