elementary-dev-community team mailing list archive

[nhanth87 <nhanth87@xxxxxxxxx>]

nhanth87 has proposed merging lp:~elementary-dev-community/switchboard/fix-1358123 into lp:switchboard.

Commit message:
#1358123 Switchboard plug always focus in search box if a plug run from command line

Requested reviews:
  elementary Pantheon team (elementary-pantheon)

For more details, see:
https://code.launchpad.net/~elementary-dev-community/switchboard/fix-1358123/+merge/235896

When switchboard run from commandline with -o, searchbox will insensitive.
When switchback to icon, searchbox will sensitive.

Testing this branch:
- basic test
  + run ./switchboard -o network-pantheon-online-accounts, check searchbar insensitive, click on facebook or gmail, check searchbar do not grab cursor focus.
  + click on "back" navigate, check searchbox sensitive again.

-- 
https://code.launchpad.net/~elementary-dev-community/switchboard/fix-1358123/+merge/235896
Your team elementary Developer Community is subscribed to branch lp:~elementary-dev-community/switchboard/fix-1358123.

=== modified file 'src/Switchboard.vala'
--- src/Switchboard.vala	2014-09-03 16:08:16 +0000
+++ src/Switchboard.vala	2014-09-25 04:40:05 +0000
@@ -57,6 +57,7 @@
         private int default_height = 0;
 
         private static string? plug_to_open = null;
+        private static bool plug_direct_open = false;
         private static bool should_animate_next_transition = true;
 
         static const OptionEntry[] entries = {
@@ -132,6 +133,7 @@
 
                 // If plug_to_open was set from the command line
                 should_animate_next_transition = false;
+                plug_direct_open = true;
             }
 
             loaded_plugs = new Gee.LinkedList <string> ();
@@ -267,6 +269,8 @@
             navigation_button.hide ();
 
             main_window.size_allocate.connect (() => {
+            if (plug_direct_open)
+                search_box.sensitive = false;
                 category_view.recalculate_columns ();
             });
 
@@ -326,6 +330,8 @@
         // Handles clicking the navigation button
         private void handle_navigation_button_clicked () {
             if (navigation_button.get_text () == all_settings_label) {
+                plug_direct_open = false;
+                search_box.sensitive = true;
                 switch_to_icons ();
                 navigation_button.hide ();
             } else {