[Libreoffice-commits] .: 2 commits - svtools/source vcl/source

[Caolán McNamara]

 svtools/source/control/tabbar.cxx |    6 +++++-
 vcl/source/window/toolbox.cxx     |    6 ++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 0714d191e7273c3b32837834f9a37867b81cb78a
Author: Ruslan Kabatsayev <b7.10110111 at gmail.com>
Date:   Mon Jul 9 10:55:42 2012 +0400

    Enable native background rendering for ToolBox
    
    Change-Id: I575dc3a4e15c88d4c61da8195ed9df6c55e5cb66

diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 9d3e115..75d0def 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -543,6 +543,12 @@ void ToolBox::ImplDrawBackground( ToolBox* pThis, const Rectangle &rRect )
     // execute pending paint requests
     ImplCheckUpdate( pThis );
 
+    if ( pThis->IsNativeControlSupported(CTRL_WINDOW_BACKGROUND,PART_ENTIRE_CONTROL) &&
+        pThis->DrawNativeControl(CTRL_WINDOW_BACKGROUND,PART_ENTIRE_CONTROL,rRect,
+            CTRL_STATE_ENABLED,ImplControlValue(0),rtl::OUString())
+        )
+        return;
+
     ImplDockingWindowWrapper *pWrapper = ImplGetDockingManager()->GetDockingWindowWrapper( pThis );
     sal_Bool bIsInPopupMode = pThis->ImplIsInPopupMode();
 
commit 64124314a11493849e50c27ad210378743f39056
Author: Ruslan Kabatsayev <b7.10110111 at gmail.com>
Date:   Sun Jul 8 23:40:46 2012 +0400

    Use native theme to draw TabBar background
    
    Change-Id: Ia274a6438dbb1e3ae94d492df6b9ff86343dd272

diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index a922241..e844ef7 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -1328,8 +1328,12 @@ private:
 
 }
 
-void TabBar::Paint( const Rectangle& )
+void TabBar::Paint( const Rectangle& rect )
 {
+    if(IsNativeControlSupported(CTRL_WINDOW_BACKGROUND,PART_ENTIRE_CONTROL))
+        DrawNativeControl(CTRL_WINDOW_BACKGROUND,PART_ENTIRE_CONTROL,rect,
+                CTRL_STATE_ENABLED,ImplControlValue(0),rtl::OUString());
+
     // Items berechnen und ausgeben
     sal_uInt16 nItemCount = (sal_uInt16)mpItemList->size();
     if (!nItemCount)