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

[Maxim Monastirsky]

 vcl/source/window/brdwin.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 121f6f3c79ea2dceb7cc3d61a56f5a56a1cb0d0d
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Sun Jan 21 01:14:13 2018 +0200

    Make the condition more obvious
    
    No need to look at possible enum values each time.
    
    Change-Id: I3191ab08d91c8f954ecfb027f1ab26b25a021f14
    Reviewed-on: https://gerrit.libreoffice.org/48258
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>

diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 5cf138c4f2e7..980e77da3043 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -1418,7 +1418,7 @@ void ImplStdBorderWindowView::DrawWindow(vcl::RenderContext& rRenderContext, con
     vcl::Region oldClipRgn(rRenderContext.GetClipRegion());
 
     // for popups, don't draw part of the frame
-    if (pData->mnTitleType >= BorderWindowTitleType::Tearoff)
+    if (!(pData->mnTitleType & (BorderWindowTitleType::Normal | BorderWindowTitleType::Small)))
     {
         FloatingWindow* pWin = dynamic_cast<FloatingWindow*>(pData->mpBorderWindow->GetWindow(GetWindowType::Client));
         if (pWin)
@@ -1444,7 +1444,7 @@ void ImplStdBorderWindowView::DrawWindow(vcl::RenderContext& rRenderContext, con
     --aInRect.Bottom();
 
     // restore
-    if (pData->mnTitleType >= BorderWindowTitleType::Tearoff)
+    if (!(pData->mnTitleType & (BorderWindowTitleType::Normal | BorderWindowTitleType::Small)))
         rRenderContext.SetClipRegion(oldClipRgn);
 
     // Draw Border