Merge lp:~radkemat/switchboard/bitesize into lp:~elementary-pantheon/switchboard/switchboard

[Matthis Radke]

don't slide in the alert screen

Fixes Bug #1322895
Just overwriting the stack transition type temporarily.

[Julián Unrrein (junrrein)]

The string still slides out when you clear the search field.

review: Needs Fixing

[Julián Unrrein (junrrein)]

string->screen

[Tom Beckmann (tombeckmann)]

I suppose it would make more sense to use http://valadoc.org/#!api=gtk+-3.0/Gtk.Stack.set_visible_child_full here, which appears to be specifically designed for this use case.

review: Needs Information

[lp:~radkemat/switchboard/bitesize]

489. By Matthis Radke on 2014-09-03

[ShowingAlert]: this is now a much more elegant solution and will not slide when clearing the search field.

[Matthis Radke (radkemat)]

I fixed it now as per Toms recommendation (thanks btw).
What is the correct procedure, to submit the patch of the patch?

[Tom Beckmann (tombeckmann)]

You did everything correctly, all looks good :)

Thanks for the fix!

review: Approve

=== modified file 'src/Switchboard.vala'
--- src/Switchboard.vala	2014-08-02 18:32:31 +0000
+++ src/Switchboard.vala	2014-09-03 16:10:22 +0000
@@ -146,15 +146,15 @@
 
         public void hide_alert () {
             alert_view.no_show_all = true;
+            stack.set_visible_child_full ("main", Gtk.StackTransitionType.NONE);
             alert_view.hide ();
-            stack.set_visible_child (category_scrolled);
         }
 
         public void show_alert (string primary_text, string secondary_text, Gtk.MessageType type) {
             alert_view.no_show_all = false;
             alert_view.show_all ();
             alert_view.set_alert (primary_text, secondary_text, null, true, type);
-            stack.set_visible_child (alert_view);
+            stack.set_visible_child_full ("alert", Gtk.StackTransitionType.NONE);
         }
 
         public void load_plug (Switchboard.Plug plug) {