diff options
author | Jan Holesovsky <kendy@suse.cz> | 2012-01-07 04:27:25 +0100 |
---|---|---|
committer | Petr Mladek <pmladek@suse.cz> | 2012-01-10 11:26:51 +0100 |
commit | 1e0de54d88a79c99f0671f608f7de096cb721537 (patch) | |
tree | 3ae52d699ca618ad2fc53f4dc22712b7a0030f61 | |
parent | a5f59c3802199f01dfbce70b01183d4d0166c2f2 (diff) |
Page Breaks: IsLeaveWindow() is unreliable, we do not need it here.
-rw-r--r-- | sw/source/ui/docvw/PageBreakWin.cxx | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/sw/source/ui/docvw/PageBreakWin.cxx b/sw/source/ui/docvw/PageBreakWin.cxx index 0edeb618d576..ff5050b3f826 100644 --- a/sw/source/ui/docvw/PageBreakWin.cxx +++ b/sw/source/ui/docvw/PageBreakWin.cxx @@ -83,17 +83,11 @@ namespace void SwBreakDashedLine::MouseMove( const MouseEvent& rMEvt ) { - if ( rMEvt.IsLeaveWindow() ) - { - // don't fade if we just move to the 'button' - Point aEventPos( GetPosPixel() + rMEvt.GetPosPixel() ); - if ( !m_pWin->Contains( aEventPos ) ) - m_pWin->Fade( false ); - } + Point aEventPos( GetPosPixel() + rMEvt.GetPosPixel() ); + if ( !m_pWin->Contains( aEventPos ) ) + m_pWin->Fade( false ); else if ( !m_pWin->IsVisible() ) - { m_pWin->Fade( true ); - } if ( !rMEvt.IsSynthetic() ) { @@ -309,13 +303,9 @@ void SwPageBreakWin::Select( ) void SwPageBreakWin::MouseMove( const MouseEvent& rMEvt ) { - if ( rMEvt.IsLeaveWindow() ) - { - // don't fade if we just move to the 'line', or the popup menu is open - Point aEventPos( rMEvt.GetPosPixel() + rMEvt.GetPosPixel() ); - if ( !Contains( aEventPos ) && !PopupMenu::IsInExecute() ) - Fade( false ); - } + Point aEventPos( rMEvt.GetPosPixel() + rMEvt.GetPosPixel() ); + if ( !Contains( aEventPos ) && !PopupMenu::IsInExecute() ) + Fade( false ); else if ( !IsVisible() ) Fade( true ); } |