cui/uiconfig/ui/textattrtabpage.ui | 4 +--- vcl/unx/gtk3/gtk3gtkinst.cxx | 11 ++++------- 2 files changed, 5 insertions(+), 10 deletions(-)
New commits: commit 79f796cc6f0c7b7e8dbc627467037e942d099c52 Author: Caolán McNamara <caol...@redhat.com> Date: Fri May 25 16:41:00 2018 +0100 fix up position of anchor widget Change-Id: I35823a4c84f6134bf9b005fb1ab6df12d716d14e Reviewed-on: https://gerrit.libreoffice.org/54816 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/cui/uiconfig/ui/textattrtabpage.ui b/cui/uiconfig/ui/textattrtabpage.ui index 2b6b02b5a4d7..d8922c205972 100644 --- a/cui/uiconfig/ui/textattrtabpage.ui +++ b/cui/uiconfig/ui/textattrtabpage.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.20.4 --> +<!-- Generated with glade 3.22.1 --> <interface domain="cui"> <requires lib="gtk+" version="3.18"/> <object class="GtkAdjustment" id="adjustment1"> @@ -407,8 +407,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property> - <property name="halign">start</property> - <property name="valign">center</property> </object> </child> </object> diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index da393b7ced7e..9fecb7981593 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -1255,14 +1255,11 @@ public: { GtkWidget* pParent = gtk_widget_get_parent(m_pWidget); if (GTK_IS_VIEWPORT(pParent)) - { pParent = gtk_widget_get_parent(pParent); - if (GTK_IS_SCROLLED_WINDOW(pParent)) - { - gtk_scrolled_window_set_min_content_width(GTK_SCROLLED_WINDOW(pParent), nWidth); - gtk_scrolled_window_set_min_content_height(GTK_SCROLLED_WINDOW(pParent), nHeight); - return; - } + if (GTK_IS_SCROLLED_WINDOW(pParent)) + { + gtk_scrolled_window_set_min_content_width(GTK_SCROLLED_WINDOW(pParent), nWidth); + gtk_scrolled_window_set_min_content_height(GTK_SCROLLED_WINDOW(pParent), nHeight); } gtk_widget_set_size_request(m_pWidget, nWidth, nHeight); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits