vcl/source/window/builder.cxx | 2 +-
vcl/unx/gtk3/gtkframe.cxx | 15 ++++-----------
2 files changed, 5 insertions(+), 12 deletions(-)
New commits:
commit 7db0efb7a318d8628168d3ca7bab1690f15828e2
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon May 10 12:12:47 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon May 10 15:58:39 2021 +0200
gtk4: use GDK_ALT_MASK
define GDK_ALT_MASK as GDK_MOD1_MASK for gtk3
Change-Id: Iff6340956b83403af37b0416a234b6937f1bea18
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115328
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 32267d8c95b2..522ec374693c 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -3416,7 +3416,7 @@ namespace
{
bool bShift = rKey.second.indexOf("GDK_SHIFT_MASK") != -1;
bool bMod1 = rKey.second.indexOf("GDK_CONTROL_MASK") != -1;
- bool bMod2 = rKey.second.indexOf("GDK_MOD1_MASK") != -1;
+ bool bMod2 = rKey.second.indexOf("GDK_ALT_MASK") != -1;
bool bMod3 = rKey.second.indexOf("GDK_MOD2_MASK") != -1;
if (rKey.first == "Insert")
diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx
index 6fd2466a0f85..004fde48b3ea 100644
--- a/vcl/unx/gtk3/gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
@@ -61,6 +61,10 @@
#include <com/sun/star/awt/MouseButton.hpp>
#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
+#if !GTK_CHECK_VERSION(4, 0, 0)
+# define GDK_ALT_MASK GDK_MOD1_MASK
+#endif
+
using namespace com::sun::star;
int GtkSalFrame::m_nFloats = 0;
@@ -74,13 +78,8 @@ sal_uInt16 GtkSalFrame::GetKeyModCode( guint state )
nCode |= KEY_SHIFT;
if( state & GDK_CONTROL_MASK )
nCode |= KEY_MOD1;
-#if !GTK_CHECK_VERSION(4, 0, 0)
- if( state & GDK_MOD1_MASK )
- nCode |= KEY_MOD2;
-#else
if (state & GDK_ALT_MASK)
nCode |= KEY_MOD2;
-#endif
if( state & GDK_SUPER_MASK )
nCode |= KEY_MOD3;
return nCode;
@@ -2324,13 +2323,7 @@ void GtkSalFrame::KeyCodeToGdkKey(const vcl::KeyCode&
rKeyCode,
nModifiers = static_cast<GdkModifierType>( nModifiers |
GDK_CONTROL_MASK );
if ( rKeyCode.IsMod2() )
- {
-#if !GTK_CHECK_VERSION(4, 0, 0)
- nModifiers = static_cast<GdkModifierType>( nModifiers | GDK_MOD1_MASK
);
-#else
nModifiers = static_cast<GdkModifierType>( nModifiers | GDK_ALT_MASK );
-#endif
- }
*pGdkModifiers = nModifiers;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
