summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-08-20 12:01:14 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-08-20 14:00:58 +0100
commit4b339818bb036b409dd5dc00d645c62063e63de5 (patch)
treecd27d4fc5a75930cb6565d362a1cfc2261c404e1 /sc
parenteba5e5b6b6577cc2d0bbd1ff66eefd0e2024fc4e (diff)
add a VclViewport
like GtkViewport so that the scrolled region will be clipped, which also has the side-effect of stopping glade clobbering the non view-port scrolled .ui files on editing Change-Id: Ic64174b3a35b77f068e0085cdc7721aeb33f1d82
Diffstat (limited to 'sc')
-rw-r--r--sc/uiconfig/scalc/ui/retypepassdialog.ui19
-rw-r--r--sc/uiconfig/scalc/ui/sortcriteriapage.ui17
2 files changed, 25 insertions, 11 deletions
diff --git a/sc/uiconfig/scalc/ui/retypepassdialog.ui b/sc/uiconfig/scalc/ui/retypepassdialog.ui
index 95459f275264..88d32498661c 100644
--- a/sc/uiconfig/scalc/ui/retypepassdialog.ui
+++ b/sc/uiconfig/scalc/ui/retypepassdialog.ui
@@ -188,15 +188,20 @@
<property name="vexpand">True</property>
<property name="vscrollbar_policy">always</property>
<child>
- <object class="GtkBox" id="sheetsBox">
+ <object class="GtkViewport" id="viewport1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
<child>
- <placeholder/>
+ <object class="GtkBox" id="sheetsBox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
</child>
</object>
</child>
diff --git a/sc/uiconfig/scalc/ui/sortcriteriapage.ui b/sc/uiconfig/scalc/ui/sortcriteriapage.ui
index 6b9202125d0a..c7347ef18510 100644
--- a/sc/uiconfig/scalc/ui/sortcriteriapage.ui
+++ b/sc/uiconfig/scalc/ui/sortcriteriapage.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkScrolledWindow" id="SortCriteriaPage">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -9,14 +10,22 @@
<property name="hscrollbar_policy">never</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkBox" id="SortKeyWindow">
+ <object class="GtkViewport" id="viewport2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="orientation">vertical</property>
<child>
- <placeholder/>
+ <object class="GtkBox" id="SortKeyWindow">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
</child>
</object>
</child>