panel: menu: fixed is_focus always being false

panel: menu: first character after focus steal needs to be set

Author: trigg

src/panel/widgets/menu.cpp

@@ -511,7 +511,7 @@ bool WayfireMenu::on_sort(Gtk::FlowBoxChild *a, Gtk::FlowBoxChild *b)
 
 void WayfireMenu::on_popover_shown()
 {
-    search_entry.delete_text(0, search_entry.get_text_length());
+    search_entry.delete_text(0, search_entry.get_text().length());
     on_search_changed();
     set_category("All");
     flowbox.unselect_all();
@@ -594,6 +594,12 @@ void WayfireMenu::setup_popover_layout()
     signals.push_back(typing_gesture->signal_key_pressed().connect([=] (guint keyval, guint keycode,
                                                                         Gdk::ModifierType state)
     {
+        Gtk::Widget* focused = nullptr;
+        auto root = popover_layout_box.get_root();
+        if(root)
+        {
+            focused = root->get_focus();
+        }
         if ((keyval == GDK_KEY_Return) || (keyval == GDK_KEY_KP_Enter))
         {
             auto children = flowbox.get_selected_children();
@@ -608,22 +614,29 @@ void WayfireMenu::setup_popover_layout()
         {
             button->get_popover()->hide();
             fullscreen.hide();
+            return true;
         } else if ((keyval == GDK_KEY_Up) ||
                    (keyval == GDK_KEY_Down) ||
                    (keyval == GDK_KEY_Left) ||
                    (keyval == GDK_KEY_Right))
         {
             return false;
-        } else if (search_entry.has_focus())
+        } else if (focused && focused->is_ancestor(search_entry))
         {
             return false;
         } else
         {
-            search_entry.grab_focus();
+            std::string input = gdk_keyval_name(keyval);
+            if(!search_entry.grab_focus())
+            {
+                std::cerr << "Unable to steal focus to entry" << std::endl;
+            }
+            search_entry.set_text(search_entry.get_text()+ input);
+            auto pos = search_entry.get_text().length();
+            search_entry.select_region(pos, pos);
             on_search_changed();
+            return false;
         }
-
-        return false;
     }, false));
     popover_layout_box.add_controller(typing_gesture);
     signals.push_back(button->get_popover()->signal_closed().connect([=] ()