mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: tdf#127262 validity out of order focus in and out problem

Browse Source 
Change-Id: I06f5fd0ce32a9f2d799f6003b7d22b13e865b8c6
Reviewed-on: https://gerrit.libreoffice.org/79611
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2019-09-26 13:05:27 +01:00
parent e61c75dffa
commit ebd37bcc22
1 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
vcl/unx/gtk3/gtk3gtkinst.cxx
View File

@@ -1260,15 +1260,16 @@ protected:
GtkInstanceBuilder* m_pBuilder; GtkInstanceBuilder* m_pBuilder;
DECL_LINK(async_signal_focus_in, void*, void); DECL_LINK(async_signal_focus_in, void*, void);
DECL_LINK(async_signal_focus_out, void*, void);
void launch_signal_focus_in() void launch_signal_focus_in()
{ {
// in e.g. function wizard RefEdits we want to select all when we get focus // in e.g. function wizard RefEdits we want to select all when we get focus
// but there are pending gtk handlers which change selection after our handler // but there are pending gtk handlers which change selection after our handler
// post our focus in event to happen after those finish // post our focus in event to happen after those finish
if (m_pFocusEvent) if (m_pFocusInEvent)
Application::RemoveUserEvent(m_pFocusEvent); Application::RemoveUserEvent(m_pFocusInEvent);
m_pFocusEvent = Application::PostUserEvent(LINK(this, GtkInstanceWidget, async_signal_focus_in)); m_pFocusInEvent = Application::PostUserEvent(LINK(this, GtkInstanceWidget, async_signal_focus_in));
} }
static gboolean signalFocusIn(GtkWidget*, GdkEvent*, gpointer widget) static gboolean signalFocusIn(GtkWidget*, GdkEvent*, gpointer widget)
@@ -1295,11 +1296,20 @@ protected:
return m_aMnemonicActivateHdl.Call(*this); return m_aMnemonicActivateHdl.Call(*this);
} }
void launch_signal_focus_out()
{
// tdf#127262 because focus in is async, focus out must not appear out
// of sequence to focus in
if (m_pFocusOutEvent)
Application::RemoveUserEvent(m_pFocusOutEvent);
m_pFocusOutEvent = Application::PostUserEvent(LINK(this, GtkInstanceWidget, async_signal_focus_out));
}
static gboolean signalFocusOut(GtkWidget*, GdkEvent*, gpointer widget) static gboolean signalFocusOut(GtkWidget*, GdkEvent*, gpointer widget)
{ {
GtkInstanceWidget* pThis = static_cast<GtkInstanceWidget*>(widget); GtkInstanceWidget* pThis = static_cast<GtkInstanceWidget*>(widget);
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
pThis->signal_focus_out(); pThis->launch_signal_focus_out();
return false; return false;
} }
@@ -1390,7 +1400,8 @@ private:
bool m_bDraggedOver; bool m_bDraggedOver;
sal_uInt16 m_nLastMouseButton; sal_uInt16 m_nLastMouseButton;
sal_uInt16 m_nLastMouseClicks; sal_uInt16 m_nLastMouseClicks;
ImplSVEvent* m_pFocusEvent; ImplSVEvent* m_pFocusInEvent;
ImplSVEvent* m_pFocusOutEvent;
GtkCssProvider* m_pBgCssProvider; GtkCssProvider* m_pBgCssProvider;
gulong m_nFocusInSignalId; gulong m_nFocusInSignalId;
gulong m_nMnemonicActivateSignalId; gulong m_nMnemonicActivateSignalId;
@@ -1613,7 +1624,8 @@ public:
, m_bDraggedOver(false) , m_bDraggedOver(false)
, m_nLastMouseButton(0) , m_nLastMouseButton(0)
, m_nLastMouseClicks(0) , m_nLastMouseClicks(0)
, m_pFocusEvent(nullptr) , m_pFocusInEvent(nullptr)
, m_pFocusOutEvent(nullptr)
, m_pBgCssProvider(nullptr) , m_pBgCssProvider(nullptr)
, m_nFocusInSignalId(0) , m_nFocusInSignalId(0)
, m_nMnemonicActivateSignalId(0) , m_nMnemonicActivateSignalId(0)
@@ -2154,8 +2166,10 @@ public:
virtual ~GtkInstanceWidget() override virtual ~GtkInstanceWidget() override
{ {
if (m_pFocusEvent) if (m_pFocusInEvent)
Application::RemoveUserEvent(m_pFocusEvent); Application::RemoveUserEvent(m_pFocusInEvent);
if (m_pFocusOutEvent)
Application::RemoveUserEvent(m_pFocusOutEvent);
if (m_nDragMotionSignalId) if (m_nDragMotionSignalId)
g_signal_handler_disconnect(m_pWidget, m_nDragMotionSignalId); g_signal_handler_disconnect(m_pWidget, m_nDragMotionSignalId);
if (m_nDragDropSignalId) if (m_nDragDropSignalId)
@@ -2245,10 +2259,16 @@ public:
IMPL_LINK_NOARG(GtkInstanceWidget, async_signal_focus_in, void*, void) IMPL_LINK_NOARG(GtkInstanceWidget, async_signal_focus_in, void*, void)
{ {
m_pFocusEvent = nullptr; m_pFocusInEvent = nullptr;
signal_focus_in(); signal_focus_in();
} }
IMPL_LINK_NOARG(GtkInstanceWidget, async_signal_focus_out, void*, void)
{
m_pFocusOutEvent = nullptr;
signal_focus_out();
}
namespace namespace
{ {
OString MapToGtkAccelerator(const OUString &rStr) OString MapToGtkAccelerator(const OUString &rStr)