[Libreoffice-commits] .: 2 commits - sw/source

[Ivan Timofeev]

 sw/source/ui/docvw/PageBreakWin.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a7b26dbf7b4c59b34fed9957c32a41348bfd6f77
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Fri Aug 10 18:05:13 2012 +0400

    Page Break: set position only when button is invisible
    
    and don't let the moribund fading-out button pursue the mouse
    
    Change-Id: I6f821f7e8144e9448c1cb65f8ce96102419cd6f0

diff --git a/sw/source/ui/docvw/PageBreakWin.cxx b/sw/source/ui/docvw/PageBreakWin.cxx
index d6d7e65..53160d1 100644
--- a/sw/source/ui/docvw/PageBreakWin.cxx
+++ b/sw/source/ui/docvw/PageBreakWin.cxx
@@ -95,7 +95,7 @@ namespace
             m_pWin->Fade( true );
         }
 
-        if ( !rMEvt.IsSynthetic() )
+        if ( !rMEvt.IsSynthetic() && !m_pWin->IsVisible() )
         {
             Point* pPtr = new Point( rMEvt.GetPosPixel() );
             m_pWin->UpdatePosition( pPtr );
commit 61df142e9398dee581935a4967f50ba0bd1d5235
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Fri Aug 10 16:14:17 2012 +0400

    Page Break: don't show if mouse is gone and button is still invisible
    
    it seems when the mouse leaves the dashed line, it immediately appears inside
    a button (if the mouse motion is not super-fast).
    
    Change-Id: I43c792fdba59feafd761bde8529a8683c07bf3d3

diff --git a/sw/source/ui/docvw/PageBreakWin.cxx b/sw/source/ui/docvw/PageBreakWin.cxx
index 23c1827..d6d7e65 100644
--- a/sw/source/ui/docvw/PageBreakWin.cxx
+++ b/sw/source/ui/docvw/PageBreakWin.cxx
@@ -87,7 +87,7 @@ namespace
         {
             // don't fade if we just move to the 'button'
             Point aEventPos( GetPosPixel() + rMEvt.GetPosPixel() );
-            if ( !m_pWin->Contains( aEventPos ) )
+            if ( !m_pWin->Contains( aEventPos ) || !m_pWin->IsVisible() )
                 m_pWin->Fade( false );
         }
         else if ( !m_pWin->IsVisible() )