summaryrefslogtreecommitdiff
path: root/svx/uiconfig
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2017-09-17 15:38:06 +0300
committerMaxim Monastirsky <momonasmon@gmail.com>2017-09-24 15:37:27 +0300
commitad769c30d2a709786a769f75fa5e04b33edf0809 (patch)
tree61fbd73f47b8fc5392e600ab33a2456bddc0a07f /svx/uiconfig
parent506f7a5e2b6af0f2bdebab257a0c8ea33e0058fb (diff)
Adjust DockingWindow layout calculation, tdf#106762 prep
This is needed for the color widget to have the correct size at initial show, and to keep this size after selecting a different palette. The parent FloatingWindow will assume that the border width stays outside the space that was allocated to the DockingWindow (see VclContainer::setLayoutPosSize), and yet DockingWindow tries to handle the border width as part of its allocated space. One option could be to let FloatingWindow handle this alone, but this won't work for other possible parents. The current solution is to load and store the border width in a way that can be used internally, but not visible to the outside world via get_border_width(). Change-Id: Id51152cf64eef719368e29253eb93e99834489cd
Diffstat (limited to 'svx/uiconfig')
-rw-r--r--svx/uiconfig/ui/docking3deffects.ui1
-rw-r--r--svx/uiconfig/ui/dockingcolorreplace.ui1
-rw-r--r--svx/uiconfig/ui/dockingfontwork.ui1
3 files changed, 0 insertions, 3 deletions
diff --git a/svx/uiconfig/ui/docking3deffects.ui b/svx/uiconfig/ui/docking3deffects.ui
index f491b35ed0d7..2e0e47ecc465 100644
--- a/svx/uiconfig/ui/docking3deffects.ui
+++ b/svx/uiconfig/ui/docking3deffects.ui
@@ -256,7 +256,6 @@
<property name="pixbuf">svx/res/normflat.png</property>
</object>
<object class="GtkWindow" id="Docking3DEffects">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
diff --git a/svx/uiconfig/ui/dockingcolorreplace.ui b/svx/uiconfig/ui/dockingcolorreplace.ui
index 77a44d403feb..1d7454ed3465 100644
--- a/svx/uiconfig/ui/dockingcolorreplace.ui
+++ b/svx/uiconfig/ui/dockingcolorreplace.ui
@@ -10,7 +10,6 @@
<property name="page_increment">10</property>
</object>
<object class="GtkWindow" id="DockingColorReplace">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
diff --git a/svx/uiconfig/ui/dockingfontwork.ui b/svx/uiconfig/ui/dockingfontwork.ui
index b1abc2dea0fb..b17936df2e43 100644
--- a/svx/uiconfig/ui/dockingfontwork.ui
+++ b/svx/uiconfig/ui/dockingfontwork.ui
@@ -10,7 +10,6 @@
<property name="page_increment">1</property>
</object>
<object class="GtkWindow" id="DockingFontwork">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>