include/vcl/settings.hxx | 3 +--
vcl/source/window/winproc.cxx | 6 ------
2 files changed, 1 insertion(+), 8 deletions(-)
New commits:
commit 28a8a14f1782520cf1699b5610b23917daa5ee9a
Author: Noel Grandin <n...@peralex.com>
AuthorDate: Thu Jan 28 12:12:45 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Jan 28 12:17:21 2021 +0100
MouseSettingsOptions::AutoFocus is dead
ever since initial import
Change-Id: I4ada9a00d3d13b90caa23e90eb66a13eef5c9f52
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110050
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index f09e50608e76..b62f1b2d0522 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -53,13 +53,12 @@ namespace vcl {
enum class MouseSettingsOptions
{
NONE = 0x00,
- AutoFocus = 0x01,
AutoCenterPos = 0x02,
AutoDefBtnPos = 0x04,
};
namespace o3tl
{
- template<> struct typed_flags<MouseSettingsOptions> :
is_typed_flags<MouseSettingsOptions, 0x07> {};
+ template<> struct typed_flags<MouseSettingsOptions> :
is_typed_flags<MouseSettingsOptions, 0x06> {};
}
enum class MouseFollowFlags
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index d6f1b1e18bc2..72aba0a4362d 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -666,12 +666,6 @@ bool ImplHandleMouseEvent( const VclPtr<vcl::Window>&
xWindow, MouseNotifyEvent
}
else
{
- // Auto-ToTop
- if (!pSVData->mpWinData->mpCaptureWin
- && (pChild->GetSettings().GetMouseSettings().GetOptions()
- & MouseSettingsOptions::AutoFocus))
- pChild->ToTop( ToTopFlags::NoGrabFocus );
-
if( pChild->IsDisposed() )
bCallHelpRequest = false;
else
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
