[gnome-calculator] Removed unnecessary scrolledwindow (bgo#768656)



commit 5ceab38338e746fe3327bfa46e2168c6e32dfba6
Author: Robert Roth <robert roth off gmail com>
Date:   Wed Oct 19 15:28:29 2016 +0300

    Removed unnecessary scrolledwindow (bgo#768656)

 data/math-window.ui  |   19 +------------------
 src/math-window.vala |    4 +---
 2 files changed, 2 insertions(+), 21 deletions(-)
---
diff --git a/data/math-window.ui b/data/math-window.ui
index ebae08f..b5f581a 100644
--- a/data/math-window.ui
+++ b/data/math-window.ui
@@ -58,24 +58,7 @@
         <property name="orientation">vertical</property>
         <property name="row_spacing">6</property>
         <child>
-          <object class="GtkScrolledWindow" id="scrolled_window">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
-            <property name="hadjustment">hadjustment</property>
-            <property name="vadjustment">vadjustment</property>
-            <property name="hscrollbar_policy">never</property>
-            <property name="shadow_type">in</property>
-            <property name="min_content_height">170</property>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
+          <placeholder/>
         </child>
         <child>
           <object class="MathConverter" id="converter">
diff --git a/src/math-window.vala b/src/math-window.vala
index f9325e0..0be4930 100644
--- a/src/math-window.vala
+++ b/src/math-window.vala
@@ -27,8 +27,6 @@ public class MathWindow : Gtk.ApplicationWindow
     [GtkChild]
     private Gtk.Label mode_label;
     [GtkChild]
-    private Gtk.ScrolledWindow scrolled_window;
-    [GtkChild]
     private Gtk.Grid grid;
     [GtkChild]
     private MathConverter converter;
@@ -55,7 +53,7 @@ public class MathWindow : Gtk.ApplicationWindow
         converter.set_conversion (equation.source_units, equation.target_units);
 
         _display = new MathDisplay (equation);
-        scrolled_window.add (_display);
+        grid.attach (_display, 0, 1, 1, 1);
         _display.show ();
         _display.grabfocus ();
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]