[Libreoffice-commits] core.git: sw/source

[Michael Meeks]

 sw/source/uibase/inc/conttree.hxx  |    1 +
 sw/source/uibase/utlui/content.cxx |   10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 484cee0e0c655cf1fc1bff4758e4eb6e4dd0184e
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Wed Dec 9 17:43:44 2015 +0000

    writer: Defer update, until post first render to avoid flicker.
    
    Change-Id: Ib16f5b345901adc7036a8a90d0f46aa3499d66ae

diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx
index 010b347..ca22dc7 100644
--- a/sw/source/uibase/inc/conttree.hxx
+++ b/sw/source/uibase/inc/conttree.hxx
@@ -137,6 +137,7 @@ protected:
                                     SvTreeListEntry*& rpNewParent,
                                     sal_uLong&        rNewChildPos
                                 ) override;
+    virtual void    Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override;
     virtual void    MouseButtonDown( const MouseEvent& rMEvt ) override;
 
     void            EditEntry( SvTreeListEntry* pEntry, EditEntryMode nMode );
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 8536c4c..3feb1f9 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -2424,10 +2424,18 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, bool bModifier)
 
 void    SwContentTree::ShowTree()
 {
-    m_aUpdTimer.Start();
     SvTreeListBox::Show();
 }
 
+void SwContentTree::Paint( vcl::RenderContext& rRenderContext,
+                           const Rectangle& rRect )
+{
+    // Start the update timer on the first paint; avoids
+    // flicker on the first reveal.
+    m_aUpdTimer.Start();
+    SvTreeListBox::Paint( rRenderContext, rRect );
+}
+
 // folded together will not be glidled
 
 void    SwContentTree::HideTree()