diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-01-03 11:28:38 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-01-03 14:12:25 +0000 |
commit | 95965d819e4e29de62d57f8e2b83159e7dcea13b (patch) | |
tree | 5b84ebbdd93517d535a230701e1764fefdca60f7 | |
parent | cf8b7109c901fff155925aee014ba23c2917fb1c (diff) |
BorderWindowHitTest::Pin is never set
Change-Id: Ic50dd49b1470d4ee233e781e8c951c10c84968fd
-rw-r--r-- | vcl/inc/brdwin.hxx | 1 | ||||
-rw-r--r-- | vcl/source/window/brdwin.cxx | 36 |
2 files changed, 0 insertions, 37 deletions
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx index 25cc41acd76e..27c2dc930a1a 100644 --- a/vcl/inc/brdwin.hxx +++ b/vcl/inc/brdwin.hxx @@ -58,7 +58,6 @@ enum class BorderWindowHitTest { Dock = 0x1000, Hide = 0x2000, Help = 0x4000, - Pin = 0x8000 }; namespace o3tl { template<> struct typed_flags<BorderWindowHitTest> : is_typed_flags<BorderWindowHitTest, 0xffff> {}; diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index fd9fa17d7b54..d8a2de025ab2 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -326,11 +326,6 @@ OUString ImplBorderWindowView::ImplRequestHelp( ImplBorderFrameData* pData, nHelpId = SV_HELPTEXT_HELP; rHelpRect = pData->maHelpRect; } - else if ( nHitTest & BorderWindowHitTest::Pin ) - { - nHelpId = SV_HELPTEXT_ALWAYSVISIBLE; - rHelpRect = Rectangle(); - } else if ( nHitTest & BorderWindowHitTest::Title ) { if( !pData->maTitleRect.IsEmpty() ) @@ -826,11 +821,6 @@ bool ImplStdBorderWindowView::MouseButtonDown( const MouseEvent& rMEvt ) maFrameData.mnHelpState |= DrawButtonFlags::Pressed; pBorderWindow->InvalidateBorder(); } - else if ( maFrameData.mnHitTest & BorderWindowHitTest::Pin ) - { - maFrameData.mnPinState |= DrawButtonFlags::Pressed; - pBorderWindow->InvalidateBorder(); - } else { if ( rMEvt.GetClicks() == 1 ) @@ -1003,24 +993,6 @@ bool ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt ) } } } - else if ( nHitTest & BorderWindowHitTest::Pin ) - { - if ( maFrameData.mnPinState & DrawButtonFlags::Pressed ) - { - maFrameData.mnPinState &= ~DrawButtonFlags::Pressed; - pBorderWindow->InvalidateBorder(); - - // do not call a Click-Handler when aborting - if ( !rTEvt.IsTrackingCanceled() ) - { - if ( pBorderWindow->ImplGetClientWindow()->IsSystemWindow() ) - { - SystemWindow* pClientWindow = static_cast<SystemWindow*>(pBorderWindow->ImplGetClientWindow()); - pClientWindow->SetPin( !pClientWindow->IsPinned() ); - } - } - } - } else { if ( maFrameData.mbDragFull ) @@ -1164,14 +1136,6 @@ bool ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt ) } } } - else if ( maFrameData.mnHitTest & BorderWindowHitTest::Pin ) - { - if ( maFrameData.mnPinState & DrawButtonFlags::Pressed ) - { - maFrameData.mnPinState &= ~DrawButtonFlags::Pressed; - pBorderWindow->InvalidateBorder(); - } - } else { aMousePos.X() -= maFrameData.maMouseOff.X(); |