[Libreoffice-commits] core.git: 2 commits - svtools/source svx/uiconfig vcl/unx

[Maxim Monastirsky]

 svtools/source/control/valueset.cxx |    3 ---
 svx/uiconfig/ui/colorwindow.ui      |    3 +--
 vcl/unx/gtk3/gtk3gtkinst.cxx        |    3 +++
 3 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 2113992e740ec5ba58b150acef04c355cb10bdad
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Wed Jul 4 19:39:05 2018 +0300

    Honor border width in a welded color picker for gtk3/x11
    
    Change-Id: I1b59e85edb8e9df5be453dc0be1d7d1ffd100ceb
    Reviewed-on: https://gerrit.libreoffice.org/56996
    Tested-by: Jenkins
    Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index e2bc52fc922a..4d1c42f7f1dd 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -2939,6 +2939,9 @@ private:
         }
         else
         {
+            //set border width
+            gtk_container_set_border_width(GTK_CONTAINER(m_pMenuHack), gtk_container_get_border_width(GTK_CONTAINER(m_pPopover)));
+
             //steal popover contents and smuggle into toplevel display window
             GtkWidget* pChild = gtk_bin_get_child(GTK_BIN(m_pPopover));
             g_object_ref(pChild);
commit 8161d9cf7649e1183e51aaa2525a9c0374205a3d
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Wed Jul 4 19:38:54 2018 +0300

    Fix initial width of the color palette in welded picker
    
    Problem can be seen with non-gtk3, if the initial
    palette has no scrollbar (e.g. "standard" palette).
    
    The cause is that in non-gtk3 we don't have overlay
    scrollbars, so the palette area needs to be enlarged
    when switching from a palette with a scrollbar to a
    palette without a scrollbar. In practise, this was
    happening also on initial show, although the palette
    already had the correct width.
    
    To fix that, start with a never scrollbar policy by
    default, and add the scrollbar later if needed.
    
    Change-Id: I5286f301b3c7ef5c72b650290ace784222f7922d
    Reviewed-on: https://gerrit.libreoffice.org/56995
    Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>
    Tested-by: Maxim Monastirsky <momonasmon at gmail.com>

diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index ef76d4bd2f60..bd2cb8e0b427 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -3634,9 +3634,6 @@ Size SvtValueSet::CalcWindowSizePixel( const Size& rItemSize, sal_uInt16 nDesire
         aSize.AdjustHeight(nTxtHeight + n + mnSpacing );
     }
 
-    // sum possible ScrollBar width
-    aSize.AdjustWidth(GetScrollWidth());
-
     return aSize;
 }
 
diff --git a/svx/uiconfig/ui/colorwindow.ui b/svx/uiconfig/ui/colorwindow.ui
index 1c2e815eba12..8ec1d1be10ec 100644
--- a/svx/uiconfig/ui/colorwindow.ui
+++ b/svx/uiconfig/ui/colorwindow.ui
@@ -22,8 +22,6 @@
   </object>
   <object class="GtkPopover" id="palette_popup_window">
     <property name="can_focus">False</property>
-    <property name="hexpand">True</property>
-    <property name="vexpand">True</property>
     <property name="border_width">4</property>
     <property name="position">bottom</property>
     <property name="constrain_to">none</property>
@@ -106,6 +104,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="hscrollbar_policy">never</property>
+            <property name="vscrollbar_policy">never</property>
             <property name="shadow_type">in</property>
             <child>
               <object class="GtkViewport">