diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-08-13 12:43:35 +0100 |
---|---|---|
committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2019-08-14 12:52:46 +0200 |
commit | afe2e8d7323d2be6388056400ee053d401d36888 (patch) | |
tree | 1d64627a96a6782b54cbe5cb645937076b126cce | |
parent | 33258dfc3b97fd357273c52d9c7c9854362e25b6 (diff) |
Resolves: tdf#126844 focus in to combobox with entries not seen in parent
there isn't a focus-in on the combobox, only the entry. So use
entry focus-in as focus-in (we already do this for the combobox dropdown)
Change-Id: I09cf6eb896acbbea5aed2d3b2aa238593ddcb793
Reviewed-on: https://gerrit.libreoffice.org/77410
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
-rw-r--r-- | vcl/unx/gtk3/gtk3gtkinst.cxx | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 384011f8c191..507ec779312b 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -9044,6 +9044,7 @@ private: gulong m_nKeyPressEventSignalId; gulong m_nEntryInsertTextSignalId; gulong m_nEntryActivateSignalId; + gulong m_nEntryFocusInSignalId; gulong m_nEntryFocusOutSignalId; guint m_nAutoCompleteIdleId; @@ -9166,6 +9167,17 @@ private: } } + static void signalEntryFocusIn(GtkWidget*, GdkEvent*, gpointer widget) + { + GtkInstanceComboBox* pThis = static_cast<GtkInstanceComboBox*>(widget); + pThis->signal_entry_focus_in(); + } + + void signal_entry_focus_in() + { + signal_focus_in(); + } + static void signalEntryFocusOut(GtkWidget*, GdkEvent*, gpointer widget) { GtkInstanceComboBox* pThis = static_cast<GtkInstanceComboBox*>(widget); @@ -9183,6 +9195,7 @@ private: if (nMin != 0 || nMax != get_active_text().getLength()) select_entry_region(0, 0); } + signal_focus_out(); } static void signalEntryActivate(GtkEntry*, gpointer widget) @@ -9469,6 +9482,7 @@ public: m_bAutoComplete = true; m_nEntryInsertTextSignalId = g_signal_connect(pEntry, "insert-text", G_CALLBACK(signalEntryInsertText), this); m_nEntryActivateSignalId = g_signal_connect(pEntry, "activate", G_CALLBACK(signalEntryActivate), this); + m_nEntryFocusInSignalId = g_signal_connect(pEntry, "focus-in-event", G_CALLBACK(signalEntryFocusIn), this); m_nEntryFocusOutSignalId = g_signal_connect(pEntry, "focus-out-event", G_CALLBACK(signalEntryFocusOut), this); m_nKeyPressEventSignalId = 0; } @@ -9476,6 +9490,7 @@ public: { m_nEntryInsertTextSignalId = 0; m_nEntryActivateSignalId = 0; + m_nEntryFocusInSignalId = 0; m_nEntryFocusOutSignalId = 0; m_nKeyPressEventSignalId = g_signal_connect(m_pWidget, "key-press-event", G_CALLBACK(signalKeyPress), this); } @@ -9767,6 +9782,7 @@ public: { g_signal_handler_block(pEntry, m_nEntryInsertTextSignalId); g_signal_handler_block(pEntry, m_nEntryActivateSignalId); + g_signal_handler_block(pEntry, m_nEntryFocusInSignalId); g_signal_handler_block(pEntry, m_nEntryFocusOutSignalId); } else @@ -9792,6 +9808,7 @@ public: if (GtkEntry* pEntry = get_entry()) { g_signal_handler_unblock(pEntry, m_nEntryActivateSignalId); + g_signal_handler_unblock(pEntry, m_nEntryFocusInSignalId); g_signal_handler_unblock(pEntry, m_nEntryFocusOutSignalId); g_signal_handler_unblock(pEntry, m_nEntryInsertTextSignalId); } @@ -9860,6 +9877,7 @@ public: { g_signal_handler_disconnect(pEntry, m_nEntryInsertTextSignalId); g_signal_handler_disconnect(pEntry, m_nEntryActivateSignalId); + g_signal_handler_disconnect(pEntry, m_nEntryFocusInSignalId); g_signal_handler_disconnect(pEntry, m_nEntryFocusOutSignalId); } else |