From 4b339818bb036b409dd5dc00d645c62063e63de5 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 20 Aug 2014 12:01:14 +0100
Subject: 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
---
 reportdesign/source/ui/dlg/CondFormat.cxx             | 2 +-
 reportdesign/uiconfig/dbreport/ui/condformatdialog.ui | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'reportdesign')

diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx
index 82fb0fdf225d..7390352cb0fe 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -321,7 +321,7 @@ namespace rptui
             return;
         long nConditionHeight = m_aConditions[0]->get_preferred_size().Height();
         Point aConditionPos(0, -1 * nConditionHeight * impl_getFirstVisibleConditionIndex());
-        m_pScrollWindow->get_child()->SetPosPixel(aConditionPos);
+        m_pConditionPlayground->SetPosPixel(aConditionPos);
     }
 
     void ConditionalFormattingDialog::impl_layoutAll()
diff --git a/reportdesign/uiconfig/dbreport/ui/condformatdialog.ui b/reportdesign/uiconfig/dbreport/ui/condformatdialog.ui
index 741ce749bdc0..a3ff67b406c6 100644
--- a/reportdesign/uiconfig/dbreport/ui/condformatdialog.ui
+++ b/reportdesign/uiconfig/dbreport/ui/condformatdialog.ui
@@ -92,6 +92,9 @@
                 <property name="vscrollbar_policy">always</property>
                 <property name="shadow_type">in</property>
                 <child>
+                  <object class="GtkViewport" id="viewport1">
+                    <property name="visible">True</property>
+                    <child>
                       <object class="GtkBox" id="condPlaygroundDrawingarea">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
@@ -102,6 +105,8 @@
                           <placeholder/>
                         </child>
                       </object>
+                    </child>
+                  </object>
                 </child>
               </object>
               <packing>
-- 
cgit