summaryrefslogtreecommitdiff
path: root/test/smoke-tests
diff options
context:
space:
mode:
authorFelipe Erias Morandeira <femorandeira@igalia.com>2013-07-04 15:53:48 +0100
committerFelipe Erias Morandeira <femorandeira@igalia.com>2013-07-22 13:24:18 +0100
commitbf44cd5821a1beb6ff067b0dd654f10763a1c758 (patch)
tree789fba7d5aa4cf04527e47a6fd18b7ca40d69a1e /test/smoke-tests
parentae9928b88ac2bcc82921e04e8cf4df5e18be174d (diff)
EosActionMenu extends GtkFrame
[endlessm/eos-sdk#146]
Diffstat (limited to 'test/smoke-tests')
-rw-r--r--test/smoke-tests/action-buttons.js14
1 files changed, 4 insertions, 10 deletions
diff --git a/test/smoke-tests/action-buttons.js b/test/smoke-tests/action-buttons.js
index cc8534b..62ab858 100644
--- a/test/smoke-tests/action-buttons.js
+++ b/test/smoke-tests/action-buttons.js
@@ -24,26 +24,20 @@ const TestApplication = new Lang.Class ({
this._darkSwitch = new Gtk.Switch ({active: false});
this._darkSwitch.connect ('notify::active', Lang.bind (this, function (active) {
if (this._darkSwitch.get_active()) {
- this._menu_panel.get_style_context().add_class('dark');
+ this._menu.get_style_context().add_class('dark');
} else {
- this._menu_panel.get_style_context().remove_class('dark');
+ this._menu.get_style_context().remove_class('dark');
}
}));
this._content.add(new Gtk.Label ({label: 'Dark action menu'}), 0, 0, 1, 1);
this._content.add(this._darkSwitch, 0, 1, 1, 1);
- this._menu = new Endless.ActionMenu ();
+ this._menu = new Endless.ActionMenu ({name: 'menu'});
- // put the ActionMenu in a panel, as GtkGrid doesn't expand if none of its children want to
- this._menu_panel = new Gtk.Frame ({name: 'menu'});
- this._menu_panel.add (this._menu);
- this._menu_panel.set_hexpand (true);
- this._menu_panel.set_vexpand (true);
-
// the ActionMenu takes 1/6 of the width
this._page.set_column_homogeneous (true);
this._page.attach (this._content, 0, 0, 5, 1);
- this._page.attach (this._menu_panel, 5, 0, 1, 1);
+ this._page.attach (this._menu, 5, 0, 1, 1);
this._menu.add_action ({
name: 'select',