[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkinst.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 43ae7dfb6f6c5f75544067f7cf978ff9c090fd54
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Jun 8 14:38:08 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jun 9 21:46:04 2020 +0200

    tdf#133412 replicate active entry to ComboBox replacement
    
    Change-Id: Ifde87738710406fb9f28008fa96241d59c52f450
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95818
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 3b25934e4002..41bd249076c3 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -13748,6 +13748,7 @@ public:
         , m_nMRUCount(0)
         , m_nMaxMRUCount(0)
     {
+        int nActive = gtk_combo_box_get_active(m_pComboBox);
         insertAsParent(GTK_WIDGET(m_pComboBox), GTK_WIDGET(getContainer()));
         gtk_widget_set_visible(GTK_WIDGET(m_pComboBox), false);
         gtk_widget_set_no_show_all(GTK_WIDGET(m_pComboBox), true);
@@ -13836,6 +13837,9 @@ public:
 
         g_list_free(cells);
 
+        if (nActive != -1)
+            tree_view_set_cursor(nActive);
+
         g_signal_connect(m_pMenuWindow, "grab-broken-event", G_CALLBACK(signalGrabBroken), this);
         g_signal_connect(m_pMenuWindow, "button-press-event", G_CALLBACK(signalButtonPress), this);
         g_signal_connect(m_pMenuWindow, "motion-notify-event", G_CALLBACK(signalMotion), this);