[gnome-calculator/wip/glade: 1/4] Remove unused parent class GtkBox in HistoryView and use GtkScrolledWindow
- From: Alberto Ruiz <aruiz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calculator/wip/glade: 1/4] Remove unused parent class GtkBox in HistoryView and use GtkScrolledWindow
- Date: Sun, 17 Jan 2016 03:51:33 +0000 (UTC)
commit da4085b8ebf341b337da130ca5ea8170dff7be77
Author: Alberto Ruiz <aruiz gnome org>
Date: Sat Jan 16 20:30:33 2016 +0000
Remove unused parent class GtkBox in HistoryView and use GtkScrolledWindow
src/math-display.vala | 6 +++++-
src/math-history.vala | 32 +++++++++++++++-----------------
2 files changed, 20 insertions(+), 18 deletions(-)
---
diff --git a/src/math-display.vala b/src/math-display.vala
index 91c41c5..1d22300 100644
--- a/src/math-display.vala
+++ b/src/math-display.vala
@@ -30,7 +30,11 @@ public class MathDisplay : Gtk.Viewport
_equation.history_signal.connect (this.handler);
var main_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
add (main_box);
- history = new HistoryView (this, main_box);
+
+ history = new HistoryView (this);
+ main_box.add (history);
+ main_box.show_all ();
+
var scrolled_window = new Gtk.ScrolledWindow (null, null);
scrolled_window.set_policy (Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.NEVER);
source_view = new Gtk.SourceView.with_buffer (equation);
diff --git a/src/math-history.vala b/src/math-history.vala
index 862537a..a9c1567 100644
--- a/src/math-history.vala
+++ b/src/math-history.vala
@@ -8,38 +8,36 @@
* license.
*/
-public class HistoryView : Gtk.Box
+public class HistoryView : Gtk.ScrolledWindow
{
int no_ofitems = 0; /* No of entries in history-view listbox */
- Gtk.ScrolledWindow scroll_window;
Gtk.ListBox listbox;
- Gtk.Box main_box;
+
private MathDisplay _display;
public MathDisplay display { get { return _display; } }
/* Creates a History-View box */
- public HistoryView (MathDisplay display, Gtk.Box box)
+ public HistoryView (MathDisplay display)
{
_display = display;
- main_box = box;
+
listbox = new Gtk.ListBox ();
listbox.set_selection_mode (Gtk.SelectionMode.NONE);
listbox.set_border_width (5);
- scroll_window = new Gtk.ScrolledWindow (null, null);
- scroll_window.set_shadow_type (Gtk.ShadowType.ETCHED_OUT);
- scroll_window.set_policy (Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
- scroll_window.set_placement (Gtk.CornerType.TOP_LEFT);
- scroll_window.add (listbox);
- scroll_window.set_vexpand (true);
listbox.set_vexpand (true);
- scroll_window.set_size_request (100, 100);
- scroll_window.size_allocate.connect (scroll_bottom);
- main_box.add (scroll_window);
- main_box.show_all ();
+ add (listbox);
+
+ set_shadow_type (Gtk.ShadowType.ETCHED_OUT);
+ set_policy (Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
+ set_placement (Gtk.CornerType.TOP_LEFT);
+ set_vexpand (true);
+
+ set_size_request (100, 100);
+ size_allocate.connect (scroll_bottom);
}
public void scroll_bottom ()
- { /* Scrolls to the last entered history-view entry */
- Gtk.Adjustment adjustment = scroll_window.get_vadjustment ();
+ {
+ var adjustment = get_vadjustment ();
adjustment.set_value (adjustment.get_upper () - adjustment.get_page_size ());
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]