[gnome-calculator] Refactor MathWindow layout toggles to switch from and to Keyboard mode
- From: Alberto Ruiz <aruiz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calculator] Refactor MathWindow layout toggles to switch from and to Keyboard mode
- Date: Sat, 16 Jan 2016 13:42:20 +0000 (UTC)
commit 9ca11428d693405f4a60a5a2644451f61341cad5
Author: Alberto Ruiz <aruiz gnome org>
Date: Sat Jan 16 13:36:08 2016 +0000
Refactor MathWindow layout toggles to switch from and to Keyboard mode
src/math-window.vala | 31 +++++++++----------------------
1 files changed, 9 insertions(+), 22 deletions(-)
---
diff --git a/src/math-window.vala b/src/math-window.vala
index 98b303e..5b43bab 100644
--- a/src/math-window.vala
+++ b/src/math-window.vala
@@ -60,24 +60,11 @@ public class MathWindow : Gtk.ApplicationWindow
_display.grabfocus ();
_buttons = new MathButtons (equation);
- grid.add(buttons);
+ grid.add(_buttons);
- if (_buttons.mode != ButtonMode.KEYBOARD) /* Checks if the calculator is in Keyboard mode or not */
- {
- buttons.set_visible (true);
- remove_buttons = false;
- converter.set_visible (false);
- }
- else
- {
- buttons.set_visible(false);
- remove_buttons = true;
- converter.set_visible (true); /* Unpacks buttons if in keyboard mode */
- resizable = true;
- }
+ remove_buttons = (_buttons.mode != ButtonMode.KEYBOARD) ? true : false;
- buttons.show ();
- buttons.notify["mode"].connect (mode_changed_cb);
+ _buttons.notify["mode"].connect (mode_changed_cb);
mode_changed_cb ();
var provider = new Gtk.CssProvider ();
@@ -128,18 +115,18 @@ public class MathWindow : Gtk.ApplicationWindow
break;
}
- if (remove_buttons == true && buttons.mode != ButtonMode.KEYBOARD)
+ if (remove_buttons == true && _buttons.mode != ButtonMode.KEYBOARD)
{
- buttons.set_visible (true);
+ _buttons.show ();
remove_buttons = false;
- converter.set_visible (false);
+ converter.hide ();
resizable = false;
}
- else if (remove_buttons == false && buttons.mode == ButtonMode.KEYBOARD)
+ else if (remove_buttons == false && _buttons.mode == ButtonMode.KEYBOARD)
{
- buttons.set_visible (false);
+ _buttons.hide ();
remove_buttons = true;
- converter.set_visible (true); /* Converter above the display window is set to visible. */
+ converter.show ();
resizable = true;
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]