[Libreoffice-commits] core.git: sw/source
sw/source/uibase/docvw/edtwin.cxx | 15 +++
1 file changed, 15 insertions(+)
New commits:
commit 5aa7b65c882019b74cfab95e5e9c77150b2876b0
Author: Vincent Reher
AuthorDate: Wed Apr 6 16:45:21 2022 -0700
Commit: Caolán McNamara
CommitDate: Thu Apr 7 14:57:31 2022 +0200
Resolve tdf#49091 "UI: Alt-Left, Alt-Right keyboard shortcuts ineffective"
Change-Id: I245943fb9185e03cf52f144d9e06ab22cda13592
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132651
Tested-by: Jenkins
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/sw/source/uibase/docvw/edtwin.cxx
b/sw/source/uibase/docvw/edtwin.cxx
index 594c69e3ec87..eeb8554ccfcc 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -1744,6 +1744,21 @@ void SwEditWin::KeyInput(const KeyEvent )
goto KEYINPUT_CHECKTABLE;
KEYINPUT_CHECKTABLE:
+// Resolve bugs 49091, 53190, 93402 and
+// https://bz.apache.org/ooo/show_bug.cgi?id=113502
+// but provide an option for restoring interactive
+// table sizing functionality when needed.
+if (
+ ! (Window::GetIndicatorState() &
KeyIndicatorState::CAPSLOCK)
+ && m_rView.KeyInput( aKeyEvent ) // Keystroke is
customized
+)
+{
+bFlushBuffer = true;
+bNormalChar = false;
+eKeyState = SwKeyState::End;
+break ;
+}
+
if( rSh.IsTableMode() || !rSh.GetTableFormat() )
{
if(!pFlyFormat && SwKeyState::KeyToView != eFlyState &&
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - vcl/unx
vcl/unx/gtk3/gtkframe.cxx | 20 ++--
1 file changed, 14 insertions(+), 6 deletions(-)
New commits:
commit 41c00d9cf065a6b5ba676807b446f32426e5d642
Author: Vincent Reher
AuthorDate: Tue Apr 5 18:31:45 2022 -0700
Commit: Adolfo Jayme Barrientos
CommitDate: Thu Apr 7 08:26:25 2022 +0200
Resolves: tdf#146174 allow shortcut key event handling before menubar
Change-Id: Ib0dadafcc66604baf53169cb222a059ee3f97362
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132602
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx
index a7ba7eec9cdb..c874b23a13c5 100644
--- a/vcl/unx/gtk3/gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
@@ -3785,12 +3785,6 @@ gboolean GtkSalFrame::signalKey(GtkWidget* pWidget,
GdkEventKey* pEvent, gpointe
if (GTK_IS_WINDOW(pThis->m_pWindow))
{
-// tdf#144846 If this is registered as a menubar mnemonic then ensure
-// that any other widget won't be considered as a candidate by taking
-// over the task of launch the menubar menu outself
-if (pThis->HandleMenubarMnemonic(pEvent->state, pEvent->keyval))
-return true;
-
GtkWidget* pFocusWindow =
gtk_window_get_focus(GTK_WINDOW(pThis->m_pWindow));
bFocusInAnotherGtkWidget = pFocusWindow && pFocusWindow !=
GTK_WIDGET(pThis->m_pDrawingArea);
if (bFocusInAnotherGtkWidget)
@@ -3947,6 +3941,20 @@ gboolean GtkSalFrame::signalKey(GtkWidget* pWidget,
GdkEventKey* pEvent, gpointe
sal_Unicode(gdk_keyval_to_unicode( pEvent->keyval )),
(pEvent->type ==
GDK_KEY_PRESS),
false);
+
+// tdf#144846 If this is registered as a menubar mnemonic then ensure
+// that any other widget won't be considered as a candidate by taking
+// over the task of launch the menubar menu outself
+// The code was moved here from its original position at beginning
+// of this function in order to resolve tdf#146174.
+if (!bStopProcessingKey && // module key handler did not process key
+pEvent->type == GDK_KEY_PRESS && // module key handler handles
only GDK_KEY_PRESS
+GTK_IS_WINDOW(pThis->m_pWindow) &&
+pThis->HandleMenubarMnemonic(pEvent->state, pEvent->keyval))
+{
+return true;
+}
+
if (!aDel.isDeleted())
{
pThis->m_nKeyModifiers = ModKeyFlags::NONE;
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - vcl/unx
vcl/unx/gtk3/gtkframe.cxx | 20 ++--
1 file changed, 14 insertions(+), 6 deletions(-)
New commits:
commit 38c40316289cf78decb6b5e4b93f50ffcfe7bd52
Author: Vincent Reher
AuthorDate: Tue Apr 5 18:31:45 2022 -0700
Commit: Caolán McNamara
CommitDate: Wed Apr 6 13:51:52 2022 +0200
Resolves: tdf#146174 allow shortcut key event handling before menubar
Change-Id: Ib0dadafcc66604baf53169cb222a059ee3f97362
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132601
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx
index 66fa98d08cb5..8864a60cc50d 100644
--- a/vcl/unx/gtk3/gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
@@ -3901,12 +3901,6 @@ gboolean GtkSalFrame::signalKey(GtkWidget* pWidget,
GdkEventKey* pEvent, gpointe
if (GTK_IS_WINDOW(pThis->m_pWindow))
{
-// tdf#144846 If this is registered as a menubar mnemonic then ensure
-// that any other widget won't be considered as a candidate by taking
-// over the task of launch the menubar menu outself
-if (pThis->HandleMenubarMnemonic(pEvent->state, pEvent->keyval))
-return true;
-
GtkWidget* pFocusWindow =
gtk_window_get_focus(GTK_WINDOW(pThis->m_pWindow));
bFocusInAnotherGtkWidget = pFocusWindow && pFocusWindow !=
GTK_WIDGET(pThis->m_pFixedContainer);
if (bFocusInAnotherGtkWidget)
@@ -4058,6 +4052,20 @@ gboolean GtkSalFrame::signalKey(GtkWidget* pWidget,
GdkEventKey* pEvent, gpointe
sal_Unicode(gdk_keyval_to_unicode( pEvent->keyval )),
(pEvent->type ==
GDK_KEY_PRESS),
false);
+
+// tdf#144846 If this is registered as a menubar mnemonic then ensure
+// that any other widget won't be considered as a candidate by taking
+// over the task of launch the menubar menu outself
+// The code was moved here from its original position at beginning
+// of this function in order to resolve tdf#146174.
+if (!bStopProcessingKey && // module key handler did not process key
+pEvent->type == GDK_KEY_PRESS && // module key handler handles
only GDK_KEY_PRESS
+GTK_IS_WINDOW(pThis->m_pWindow) &&
+pThis->HandleMenubarMnemonic(pEvent->state, pEvent->keyval))
+{
+return true;
+}
+
if (!aDel.isDeleted())
{
pThis->m_nKeyModifiers = ModKeyFlags::NONE;
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtkframe.cxx | 20 ++--
1 file changed, 14 insertions(+), 6 deletions(-)
New commits:
commit 2703f729e9ea0bbc1f64b04b535a676a2980e1b8
Author: Vincent Reher
AuthorDate: Tue Apr 5 18:31:45 2022 -0700
Commit: Caolán McNamara
CommitDate: Wed Apr 6 10:43:27 2022 +0200
Resolves: tdf#146174 allow shortcut key event handling before menubar
Change-Id: Ib0dadafcc66604baf53169cb222a059ee3f97362
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132615
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx
index 29d6c00f78d7..35e761ede5fd 100644
--- a/vcl/unx/gtk3/gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
@@ -3899,12 +3899,6 @@ gboolean GtkSalFrame::signalKey(GtkWidget* pWidget,
GdkEventKey* pEvent, gpointe
if (GTK_IS_WINDOW(pThis->m_pWindow))
{
-// tdf#144846 If this is registered as a menubar mnemonic then ensure
-// that any other widget won't be considered as a candidate by taking
-// over the task of launch the menubar menu outself
-if (pThis->HandleMenubarMnemonic(pEvent->state, pEvent->keyval))
-return true;
-
GtkWidget* pFocusWindow =
gtk_window_get_focus(GTK_WINDOW(pThis->m_pWindow));
bFocusInAnotherGtkWidget = pFocusWindow && pFocusWindow !=
GTK_WIDGET(pThis->m_pFixedContainer);
if (bFocusInAnotherGtkWidget)
@@ -4056,6 +4050,20 @@ gboolean GtkSalFrame::signalKey(GtkWidget* pWidget,
GdkEventKey* pEvent, gpointe
sal_Unicode(gdk_keyval_to_unicode( pEvent->keyval )),
(pEvent->type ==
GDK_KEY_PRESS),
false);
+
+// tdf#144846 If this is registered as a menubar mnemonic then ensure
+// that any other widget won't be considered as a candidate by taking
+// over the task of launch the menubar menu outself
+// The code was moved here from its original position at beginning
+// of this function in order to resolve tdf#146174.
+if (!bStopProcessingKey && // module key handler did not process key
+pEvent->type == GDK_KEY_PRESS && // module key handler handles
only GDK_KEY_PRESS
+GTK_IS_WINDOW(pThis->m_pWindow) &&
+pThis->HandleMenubarMnemonic(pEvent->state, pEvent->keyval))
+{
+return true;
+}
+
if (!aDel.isDeleted())
{
pThis->m_nKeyModifiers = ModKeyFlags::NONE;
