summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2018-07-04 19:38:54 +0300
committerMaxim Monastirsky <momonasmon@gmail.com>2018-07-05 12:42:19 +0200
commit8161d9cf7649e1183e51aaa2525a9c0374205a3d (patch)
tree03eb194eafa50d4716e307c8ab571aa351966186 /svx
parent0e83efbccc180c957f77291fc0fdc6dd74eae0f4 (diff)
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@gmail.com> Tested-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'svx')
-rw-r--r--svx/uiconfig/ui/colorwindow.ui3
1 files changed, 1 insertions, 2 deletions
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">