diff options
| -rw-r--r-- | include/vcl/floatwin.hxx | 15 | ||||
| -rw-r--r-- | vcl/source/window/winproc.cxx | 3 |
2 files changed, 8 insertions, 10 deletions
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index 6617968d7ea5..38f1801e0694 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -37,17 +37,16 @@ enum class FloatWinPopupFlags Left = 0x000008, Right = 0x000010, NoKeyClose = 0x000020, - NoMouseRectClose = 0x000040, - AllMouseButtonClose = 0x000080, - NoAppFocusClose = 0x000100, - NewLevel = 0x000200, - NoMouseUpClose = 0x000400, - GrabFocus = 0x000800, - NoHorzPlacement = 0x001000, + AllMouseButtonClose = 0x000040, + NoAppFocusClose = 0x000080, + NewLevel = 0x000100, + NoMouseUpClose = 0x000200, + GrabFocus = 0x000400, + NoHorzPlacement = 0x000800, }; namespace o3tl { - template<> struct typed_flags<FloatWinPopupFlags> : is_typed_flags<FloatWinPopupFlags, 0x001fff> {}; + template<> struct typed_flags<FloatWinPopupFlags> : is_typed_flags<FloatWinPopupFlags, 0x0fff> {}; } enum class FloatWinPopupEndFlags diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 88ab4430ce9d..f3da016429a7 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -105,8 +105,7 @@ static bool ImplHandleMouseFloatMode( vcl::Window* pChild, const Point& rMousePo } else if ( nHitTest == HITTEST_RECT ) { - if ( !(pFloat->GetPopupModeFlags() & FloatWinPopupFlags::NoMouseRectClose) ) - pFloat->ImplSetMouseDown(); + pFloat->ImplSetMouseDown(); return true; } } |