vcl/inc/window.h | 2 +- vcl/source/window/window.cxx | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)
New commits: commit 56b3c7ca9b50c0f6dcca2e6c4a3312deb46ec647 Author: Caolán McNamara <[email protected]> AuthorDate: Tue Sep 1 15:01:19 2020 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Wed Sep 2 12:38:31 2020 +0200 AlwaysInputMode::AlwaysInputDisabled newly unused Change-Id: I2a6c84f7c12e5a24d442dba1256f27cb5b3db66e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101875 Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/vcl/inc/window.h b/vcl/inc/window.h index 52993ffa930b..ba318833f11b 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -196,7 +196,7 @@ struct ImplAccessibleInfos ~ImplAccessibleInfos(); }; -enum AlwaysInputMode { AlwaysInputNone = 0, AlwaysInputEnabled = 1, AlwaysInputDisabled =2 }; +enum AlwaysInputMode { AlwaysInputNone = 0, AlwaysInputEnabled = 1 }; enum class ImplPaintFlags { NONE = 0x0000, diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index a9fe21d0a7a3..444ec4286571 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -2497,8 +2497,7 @@ void Window::EnableInput( bool bEnable, bool bChild ) static_cast<ImplBorderWindow*>(mpWindowImpl->mpBorderWindow.get())->mpMenuBarWindow->EnableInput( bEnable ); } - if ( (! bEnable && mpWindowImpl->meAlwaysInputMode != AlwaysInputEnabled) || - ( bEnable && mpWindowImpl->meAlwaysInputMode != AlwaysInputDisabled) ) + if ( (!bEnable && mpWindowImpl->meAlwaysInputMode != AlwaysInputEnabled) || bEnable ) { // automatically stop the tracking mode or steal capture // if the window is disabled _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
