diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-02-22 19:38:56 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-02-23 10:14:07 +0100 |
| commit | 409cd9a35458cab71da4c1881f15232c8510ec7e (patch) | |
| tree | 37640f8d9114acd62f863c3081c9f9408fee2613 /sw | |
| parent | 8f7e80acd645368e486028e04abe78f49c4864e2 (diff) | |
allow fading in/out to happen while a menu is open
I don't see an ill effects and this is happening already in the
non-vcl menu case so drop the vcl-only case guard
Change-Id: I6e0c7f645f9e1d2ba79215c0458659cd2a610ef2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111357
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/docvw/HeaderFooterWin.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx index 0c4ed113f6c7..2232c7b8d4cd 100644 --- a/sw/source/uibase/docvw/HeaderFooterWin.cxx +++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx @@ -44,7 +44,6 @@ #include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <drawinglayer/processor2d/processorfromoutputdevice.hxx> #include <vcl/canvastools.hxx> -#include <vcl/menu.hxx> #include <vcl/metric.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> @@ -274,14 +273,11 @@ void SwHeaderFooterWin::ShowAll(bool bShow) m_xMenuButton->set_visible(!bIsEmptyHeaderFooter); m_xPushButton->set_visible(bIsEmptyHeaderFooter); - if (!PopupMenu::IsInExecute()) - { - m_bIsAppearing = bShow; + m_bIsAppearing = bShow; - if (m_aFadeTimer.IsActive()) - m_aFadeTimer.Stop(); - m_aFadeTimer.Start(); - } + if (m_aFadeTimer.IsActive()) + m_aFadeTimer.Stop(); + m_aFadeTimer.Start(); } bool SwHeaderFooterWin::Contains( const Point &rDocPt ) const |