summaryrefslogtreecommitdiffstats
path: root/desktop
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 /desktop
parentConvert RID_TP_GENERAL tabpage to .ui (diff)
downloadcore-4b339818bb036b409dd5dc00d645c62063e63de5.tar.gz
core-4b339818bb036b409dd5dc00d645c62063e63de5.zip
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 'desktop')
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.hxx2
-rw-r--r--desktop/uiconfig/ui/updatedialog.ui7
2 files changed, 7 insertions, 2 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
index adcc1895154a..e5365498b635 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
@@ -172,7 +172,7 @@ private:
FixedText* m_pchecking;
Throbber* m_pthrobber;
FixedText* m_pUpdate;
- VclScrolledWindow* m_pContainer;
+ VclViewport* m_pContainer;
UpdateDialog::CheckListBox* m_pUpdates;
CheckBox* m_pAll;
FixedText* m_pDescription;
diff --git a/desktop/uiconfig/ui/updatedialog.ui b/desktop/uiconfig/ui/updatedialog.ui
index 940b104edafc..e3856326c385 100644
--- a/desktop/uiconfig/ui/updatedialog.ui
+++ b/desktop/uiconfig/ui/updatedialog.ui
@@ -144,10 +144,15 @@
</packing>
</child>
<child>
- <object class="GtkScrolledWindow" id="UPDATES_CONTAINER">
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="shadow_type">in</property>
+ <child>
+ <object class="GtkViewport" id="UPDATES_CONTAINER">
+ <property name="visible">True</property>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">True</property>