From 416416fceef288e543f2f562be04bf4e8ea9b245 Mon Sep 17 00:00:00 2001
From: Hue <skeptikal.monke@gmail.com>
Date: Sat, 21 Feb 2026 16:04:46 +0100
Subject: [PATCH 01/15] fix extra actions for grid menu

---
 metadata/panel.xml         |   5 +
 src/panel/panel.cpp        |   1 +
 src/panel/widgets/menu.cpp | 181 ++++++++++++++++++++-----------------
 src/panel/widgets/menu.hpp |  21 ++---
 4 files changed, 111 insertions(+), 97 deletions(-)

diff --git a/metadata/panel.xml b/metadata/panel.xml
index 0315f5cda..7a94daed8 100644
--- a/metadata/panel.xml
+++ b/metadata/panel.xml
@@ -194,6 +194,11 @@
 		<default>42</default>
 		<min>0</min>
 	</option>
+	<option name="menu_item_icon_size" type="int">
+		<_short>Menu item icon size</_short>
+		<default>48</default>
+		<min>0</min>
+	</option>
 	<option name="menu_min_category_width" type="int">
 		<_short>Menu Minimum Category Width</_short>
 		<default>200</default>
diff --git a/src/panel/panel.cpp b/src/panel/panel.cpp
index aa5094234..0a3fef60a 100644
--- a/src/panel/panel.cpp
+++ b/src/panel/panel.cpp
@@ -526,6 +526,7 @@ void WayfirePanelApp::on_activate()
     {
         {"panel/minimal_height", ""},
         {"panel/menu_icon_size", ".menu-icon"},
+        {"panel/menu_item_icon_size", ".menu-item-icon "},
         {"panel/launchers_size", ".launcher"},
         {"panel/battery_icon_size", ".battery image"},
         {"panel/network_icon_size", ".network"},
diff --git a/src/panel/widgets/menu.cpp b/src/panel/widgets/menu.cpp
index e2295eda0..97dc134af 100644
--- a/src/panel/widgets/menu.cpp
+++ b/src/panel/widgets/menu.cpp
@@ -60,67 +60,97 @@ void WfMenuCategoryButton::on_click()
 }
 
 WfMenuMenuItem::WfMenuMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppInfo> app) :
-    Gtk::FlowBoxChild(), menu(_menu), m_app_info(app)
-{
-    m_image.set((const Glib::RefPtr<const Gio::Icon>&)app->get_icon());
-    m_image.set_pixel_size(48);
-    m_label.set_text(app->get_name());
-    m_label.set_xalign(0.0);
-    m_label.set_hexpand(true);
-    m_has_actions = app->list_actions().size() > 0;
-    m_button_box.append(m_image);
-    m_button_box.append(m_label);
-
-    m_button.set_child(m_button_box);
-    signals.push_back(m_button.signal_clicked().connect(
-        [this] ()
+    Gtk::FlowBoxChild(), menu(_menu), app_info(app)
+{
+    image.set((const Glib::RefPtr<const Gio::Icon>&)app->get_icon());
+    image.set_expand(true);
+
+    label.set_halign(Gtk::Align::CENTER);
+    label.set_text(app->get_name());
+    label.set_ellipsize(Pango::EllipsizeMode::END);
+    label.set_max_width_chars(0);
+    label.set_hexpand(true);
+
+    box.set_orientation(Gtk::Orientation::VERTICAL);
+    box.append(image);
+    box.append(label);
+    box.add_css_class("flat");
+    box.add_css_class("menu-item-icon");
+
+    auto left_click_g  = Gtk::GestureClick::create();
+    auto right_click_g = Gtk::GestureClick::create();
+    auto long_press_g    = Gtk::GestureLongPress::create();
+    left_click_g->set_button(1);
+    right_click_g->set_button(3);
+    long_press_g->set_touch_only(true);
+
+    signals.push_back(left_click_g->signal_pressed().connect(
+        [=] (int c, double x, double y)
+    {
+        on_click();
+        left_click_g->set_state(Gtk::EventSequenceState::CLAIMED);
+    }));
+    signals.push_back(right_click_g->signal_pressed().connect(
+        [=] (int c,double x, double y)
     {
-        this->on_click();
+        extra_actions_button.activate();
+        right_click_g->set_state(Gtk::EventSequenceState::CLAIMED);
     }));
-    m_padding_box.append(m_button);
-    m_label.set_ellipsize(Pango::EllipsizeMode::END);
-    m_label.set_max_width_chars(5);
-    m_button.add_css_class("flat");
-    m_extra_actions_button.add_css_class("flat");
-    m_extra_actions_button.add_css_class("app-button-extras");
-    m_extra_actions_button.set_halign(Gtk::Align::END);
-    m_extra_actions_button.set_direction(Gtk::ArrowType::RIGHT);
-    m_extra_actions_button.set_has_frame(false);
-    m_extra_actions_button.set_icon_name("arrow-right");
+    long_press_g->signal_pressed().connect(
+        [=] (double x, double y)
+    {
+        extra_actions_button.activate();
+        long_press_g->set_state(Gtk::EventSequenceState::CLAIMED);
+        left_click_g->set_state(Gtk::EventSequenceState::DENIED);
+        right_click_g->set_state(Gtk::EventSequenceState::DENIED);
+    });
+
+    extra_actions_button.add_css_class("flat");
+    extra_actions_button.add_css_class("app-button-extras");
+    extra_actions_button.set_halign(Gtk::Align::END);
+    extra_actions_button.set_direction(Gtk::ArrowType::RIGHT);
+    extra_actions_button.set_has_frame(false);
+    extra_actions_button.set_icon_name("arrow-right");
     m_menu    = Gio::Menu::create();
-    m_actions = Gio::SimpleActionGroup::create();
-    m_extra_actions_button.hide();
+    actions = Gio::SimpleActionGroup::create();
+    extra_actions_button.hide();
 
-    if (menu->menu_list)
+    for (auto action : app->list_actions())
     {
-        m_padding_box.append(m_extra_actions_button);
-        this->set_size_request(menu->menu_min_content_width, 48);
-        for (auto action : app->list_actions())
-        {
-            std::stringstream ss;
-            ss << "app." << action;
-            std::string full_action = ss.str();
+        std::stringstream ss;
+        ss << "app." << action;
+        std::string full_action = ss.str();
 
-            auto menu_item = Gio::MenuItem::create(m_app_info->get_action_name(action), full_action);
+        auto menu_item = Gio::MenuItem::create(app_info->get_action_name(action), full_action);
 
-            auto action_obj = Gio::SimpleAction::create(action);
-            signals.push_back(action_obj->signal_activate().connect(
-                [this, action] (Glib::VariantBase vb)
-            {
-                auto ctx = Gdk::Display::get_default()->get_app_launch_context();
-                m_app_info->launch_action(action, ctx);
-                menu->hide_menu();
-            }));
-            m_menu->append_item(menu_item);
-            m_actions->add_action(action_obj);
-
-            m_extra_actions_button.show();
-        }
+        auto action_obj = Gio::SimpleAction::create(action);
+        signals.push_back(action_obj->signal_activate().connect(
+            [this, action] (Glib::VariantBase vb)
+        {
+            auto ctx = Gdk::Display::get_default()->get_app_launch_context();
+            app_info->launch_action(action, ctx);
+            menu->hide_menu();
+        }));
+        m_menu->append_item(menu_item);
+        actions->add_action(action_obj);
 
-        m_extra_actions_button.set_menu_model(m_menu);
+        extra_actions_button.show();
     }
 
-    set_child(m_padding_box);
+    if (menu->menu_list)
+    {
+        box.append(extra_actions_button);
+        set_child(box);
+    } else
+    {
+        overlay.set_child(box);
+        extra_actions_button.set_valign(Gtk::Align::START);
+        overlay.add_overlay(extra_actions_button);
+        set_child(overlay);
+    }
+
+    extra_actions_button.set_menu_model(m_menu);
+
     add_css_class("app-button");
     set_has_tooltip();
     signals.push_back(signal_query_tooltip().connect([=] (int x, int y, bool key_mode,
@@ -130,29 +160,10 @@ WfMenuMenuItem::WfMenuMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppI
         tooltip->set_text(app->get_name());
         return true;
     }, false));
-    m_extra_actions_button.insert_action_group("app", m_actions);
 
-    auto click_gesture = Gtk::GestureClick::create();
-    auto long_press    = Gtk::GestureLongPress::create();
-    long_press->set_touch_only(true);
-    long_press->signal_pressed().connect(
-        [=] (double x, double y)
-    {
-        m_extra_actions_button.activate();
-        long_press->set_state(Gtk::EventSequenceState::CLAIMED);
-        click_gesture->set_state(Gtk::EventSequenceState::DENIED);
-    });
-    click_gesture->set_button(3);
-    signals.push_back(click_gesture->signal_pressed().connect([=] (int count, double x, double y)
-    {
-        click_gesture->set_state(Gtk::EventSequenceState::CLAIMED);
-    }));
-    signals.push_back(click_gesture->signal_released().connect([=] (int count, double x, double y)
-    {
-        m_extra_actions_button.activate();
-    }));
-    m_button.add_controller(long_press);
-    m_button.add_controller(click_gesture);
+    box.add_controller(left_click_g);
+    box.add_controller(right_click_g);
+    box.add_controller(long_press_g);
 }
 
 WfMenuMenuItem::~WfMenuMenuItem()
@@ -166,18 +177,18 @@ WfMenuMenuItem::~WfMenuMenuItem()
 void WfMenuMenuItem::on_click()
 {
     auto ctx = Gdk::Display::get_default()->get_app_launch_context();
-    m_app_info->launch(std::vector<Glib::RefPtr<Gio::File>>(), ctx);
+    app_info->launch(std::vector<Glib::RefPtr<Gio::File>>(), ctx);
     menu->hide_menu();
 }
 
 void WfMenuMenuItem::set_search_value(uint32_t value)
 {
-    m_search_value = value;
+    search_value = value;
 }
 
 uint32_t WfMenuMenuItem::get_search_value()
 {
-    return m_search_value;
+    return search_value;
 }
 
 /* Fuzzy search for pattern in text. We use a greedy algorithm as follows:
@@ -212,9 +223,9 @@ static bool fuzzy_match(Glib::ustring text, Glib::ustring pattern)
 uint32_t WfMenuMenuItem::fuzzy_match(Glib::ustring pattern)
 {
     uint32_t match_score = 0;
-    Glib::ustring name   = m_app_info->get_name();
-    Glib::ustring long_name = m_app_info->get_display_name();
-    Glib::ustring progr     = m_app_info->get_executable();
+    Glib::ustring name   = app_info->get_name();
+    Glib::ustring long_name = app_info->get_display_name();
+    Glib::ustring progr     = app_info->get_executable();
 
     auto name_lower = name.lowercase();
     auto long_name_lower = long_name.lowercase();
@@ -242,10 +253,10 @@ uint32_t WfMenuMenuItem::fuzzy_match(Glib::ustring pattern)
 uint32_t WfMenuMenuItem::matches(Glib::ustring pattern)
 {
     uint32_t match_score    = 0;
-    Glib::ustring long_name = m_app_info->get_display_name();
-    Glib::ustring name  = m_app_info->get_name();
-    Glib::ustring progr = m_app_info->get_executable();
-    Glib::ustring descr = m_app_info->get_description();
+    Glib::ustring long_name = app_info->get_display_name();
+    Glib::ustring name  = app_info->get_name();
+    Glib::ustring progr = app_info->get_executable();
+    Glib::ustring descr = app_info->get_description();
 
     auto name_lower = name.lowercase();
     auto long_name_lower = long_name.lowercase();
@@ -282,8 +293,8 @@ uint32_t WfMenuMenuItem::matches(Glib::ustring pattern)
 
 bool WfMenuMenuItem::operator <(const WfMenuMenuItem& other)
 {
-    return Glib::ustring(m_app_info->get_name()).lowercase() <
-           Glib::ustring(other.m_app_info->get_name()).lowercase();
+    return Glib::ustring(app_info->get_name()).lowercase() <
+           Glib::ustring(other.app_info->get_name()).lowercase();
 }
 
 void WayfireMenu::load_menu_item(AppInfo app_info)
diff --git a/src/panel/widgets/menu.hpp b/src/panel/widgets/menu.hpp
index 9f7f403f0..113ac1825 100644
--- a/src/panel/widgets/menu.hpp
+++ b/src/panel/widgets/menu.hpp
@@ -58,22 +58,19 @@ class WfMenuMenuItem : public Gtk::FlowBoxChild
 
   private:
     WayfireMenu *menu;
-    Gtk::Box m_left_pad, m_right_pad;
-    Gtk::Box m_padding_box;
-    Gtk::Box m_button_box;
-    Gtk::Button m_button;
-    Gtk::Box m_list_box;
-    Gtk::Image m_image;
-    Gtk::Label m_label;
+    Gtk::Box box;
+    Gtk::Image image;
+    Gtk::Label label;
+    Gtk::Overlay overlay; // only for the grid mode, not list
     Glib::RefPtr<Gio::Menu> m_menu;
-    Glib::RefPtr<Gio::SimpleActionGroup> m_actions;
-    Gtk::MenuButton m_extra_actions_button;
+    Glib::RefPtr<Gio::SimpleActionGroup> actions;
+    Gtk::MenuButton extra_actions_button;
     std::vector<sigc::connection> signals;
 
-    bool m_has_actions = false;
-    uint32_t m_search_value = 0;
+    bool has_actions = false;
+    uint32_t search_value = 0;
 
-    AppInfo m_app_info;
+    AppInfo app_info;
 };
 
 class WayfireLogoutUIButton

From 1d12cd7b8764218b2717e224b17a60b83be78e58 Mon Sep 17 00:00:00 2001
From: Hue <skeptikal.monke@gmail.com>
Date: Sat, 21 Feb 2026 22:10:38 +0100
Subject: [PATCH 02/15] kinda rewrite WfMenuItem

---
 src/panel/panel.cpp        |   2 +-
 src/panel/widgets/menu.cpp | 152 +++++++++++++++++++++----------------
 src/panel/widgets/menu.hpp |  12 +--
 3 files changed, 95 insertions(+), 71 deletions(-)

diff --git a/src/panel/panel.cpp b/src/panel/panel.cpp
index 0a3fef60a..6cd468d87 100644
--- a/src/panel/panel.cpp
+++ b/src/panel/panel.cpp
@@ -526,7 +526,7 @@ void WayfirePanelApp::on_activate()
     {
         {"panel/minimal_height", ""},
         {"panel/menu_icon_size", ".menu-icon"},
-        {"panel/menu_item_icon_size", ".menu-item-icon "},
+        {"panel/menu_item_icon_size", ".app-button-icon"},
         {"panel/launchers_size", ".launcher"},
         {"panel/battery_icon_size", ".battery image"},
         {"panel/network_icon_size", ".network"},
diff --git a/src/panel/widgets/menu.cpp b/src/panel/widgets/menu.cpp
index 97dc134af..fc73c1d90 100644
--- a/src/panel/widgets/menu.cpp
+++ b/src/panel/widgets/menu.cpp
@@ -59,59 +59,58 @@ void WfMenuCategoryButton::on_click()
     menu->set_category(category);
 }
 
-WfMenuMenuItem::WfMenuMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppInfo> app) :
+WfMenuItem::WfMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppInfo> app) :
     Gtk::FlowBoxChild(), menu(_menu), app_info(app)
 {
+    add_css_class("app-button");
+
     image.set((const Glib::RefPtr<const Gio::Icon>&)app->get_icon());
-    image.set_expand(true);
 
-    label.set_halign(Gtk::Align::CENTER);
     label.set_text(app->get_name());
     label.set_ellipsize(Pango::EllipsizeMode::END);
     label.set_max_width_chars(0);
-    label.set_hexpand(true);
 
-    box.set_orientation(Gtk::Orientation::VERTICAL);
-    box.append(image);
-    box.append(label);
+
+    extra_actions_button.add_css_class("flat");
+    extra_actions_button.add_css_class("app-button-extras");
+    extra_actions_button.set_direction(Gtk::ArrowType::RIGHT);
+    extra_actions_button.set_has_frame(false);
+
+    box.set_expand(false);
     box.add_css_class("flat");
-    box.add_css_class("menu-item-icon");
+    box.add_css_class("widget-icon");
+    box.add_css_class("app-button-icon");
 
-    auto left_click_g  = Gtk::GestureClick::create();
-    auto right_click_g = Gtk::GestureClick::create();
-    auto long_press_g    = Gtk::GestureLongPress::create();
-    left_click_g->set_button(1);
-    right_click_g->set_button(3);
-    long_press_g->set_touch_only(true);
+    set_child(box);
 
-    signals.push_back(left_click_g->signal_pressed().connect(
-        [=] (int c, double x, double y)
-    {
-        on_click();
-        left_click_g->set_state(Gtk::EventSequenceState::CLAIMED);
-    }));
-    signals.push_back(right_click_g->signal_pressed().connect(
-        [=] (int c,double x, double y)
+    if (menu->menu_list)
     {
-        extra_actions_button.activate();
-        right_click_g->set_state(Gtk::EventSequenceState::CLAIMED);
-    }));
-    long_press_g->signal_pressed().connect(
-        [=] (double x, double y)
+        label.set_hexpand(true);
+        label.set_halign(Gtk::Align::START);
+        box.set_orientation(Gtk::Orientation::HORIZONTAL);
+        box.append(image);
+        box.append(label);
+        extra_actions_button.set_halign(Gtk::Align::END);
+        extra_actions_button.set_icon_name("arrow-right");
+        box.append(extra_actions_button);
+    } else
     {
-        extra_actions_button.activate();
-        long_press_g->set_state(Gtk::EventSequenceState::CLAIMED);
-        left_click_g->set_state(Gtk::EventSequenceState::DENIED);
-        right_click_g->set_state(Gtk::EventSequenceState::DENIED);
-    });
+        box.set_orientation(Gtk::Orientation::VERTICAL);
+        if (app->list_actions().size() == 0)
+        {
+            button.set_child(image);
+            button.add_css_class("flat");
+            box.append(button);
+        } else
+        {
+            extra_actions_button.set_child(image);
+            box.append(extra_actions_button);
+        }
 
-    extra_actions_button.add_css_class("flat");
-    extra_actions_button.add_css_class("app-button-extras");
-    extra_actions_button.set_halign(Gtk::Align::END);
-    extra_actions_button.set_direction(Gtk::ArrowType::RIGHT);
-    extra_actions_button.set_has_frame(false);
-    extra_actions_button.set_icon_name("arrow-right");
-    m_menu    = Gio::Menu::create();
+        box.append(label);
+    }
+
+    m_menu  = Gio::Menu::create();
     actions = Gio::SimpleActionGroup::create();
     extra_actions_button.hide();
 
@@ -137,21 +136,8 @@ WfMenuMenuItem::WfMenuMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppI
         extra_actions_button.show();
     }
 
-    if (menu->menu_list)
-    {
-        box.append(extra_actions_button);
-        set_child(box);
-    } else
-    {
-        overlay.set_child(box);
-        extra_actions_button.set_valign(Gtk::Align::START);
-        overlay.add_overlay(extra_actions_button);
-        set_child(overlay);
-    }
-
     extra_actions_button.set_menu_model(m_menu);
 
-    add_css_class("app-button");
     set_has_tooltip();
     signals.push_back(signal_query_tooltip().connect([=] (int x, int y, bool key_mode,
                                                           const std::shared_ptr<Gtk::Tooltip>& tooltip) ->
@@ -161,12 +147,40 @@ WfMenuMenuItem::WfMenuMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppI
         return true;
     }, false));
 
+    auto left_click_g  = Gtk::GestureClick::create();
+    auto right_click_g = Gtk::GestureClick::create();
+    auto long_press_g  = Gtk::GestureLongPress::create();
+    left_click_g->set_button(1);
+    right_click_g->set_button(3);
+    long_press_g->set_touch_only(true);
+
+    signals.push_back(left_click_g->signal_pressed().connect(
+        [=] (int c, double x, double y)
+    {
+        on_click();
+        left_click_g->set_state(Gtk::EventSequenceState::CLAIMED);
+    }));
+    signals.push_back(right_click_g->signal_pressed().connect(
+        [=] (int c,double x, double y)
+    {
+        extra_actions_button.activate();
+        right_click_g->set_state(Gtk::EventSequenceState::CLAIMED);
+    }));
+    signals.push_back(long_press_g->signal_pressed().connect(
+        [=] (double x, double y)
+    {
+        extra_actions_button.activate();
+        long_press_g->set_state(Gtk::EventSequenceState::CLAIMED);
+        left_click_g->set_state(Gtk::EventSequenceState::DENIED);
+        right_click_g->set_state(Gtk::EventSequenceState::DENIED);
+    }));
+
     box.add_controller(left_click_g);
     box.add_controller(right_click_g);
     box.add_controller(long_press_g);
 }
 
-WfMenuMenuItem::~WfMenuMenuItem()
+WfMenuItem::~WfMenuItem()
 {
     for (auto signal : signals)
     {
@@ -174,19 +188,19 @@ WfMenuMenuItem::~WfMenuMenuItem()
     }
 }
 
-void WfMenuMenuItem::on_click()
+void WfMenuItem::on_click()
 {
     auto ctx = Gdk::Display::get_default()->get_app_launch_context();
     app_info->launch(std::vector<Glib::RefPtr<Gio::File>>(), ctx);
     menu->hide_menu();
 }
 
-void WfMenuMenuItem::set_search_value(uint32_t value)
+void WfMenuItem::set_search_value(uint32_t value)
 {
     search_value = value;
 }
 
-uint32_t WfMenuMenuItem::get_search_value()
+uint32_t WfMenuItem::get_search_value()
 {
     return search_value;
 }
@@ -220,7 +234,7 @@ static bool fuzzy_match(Glib::ustring text, Glib::ustring pattern)
     return i == pattern.length();
 }
 
-uint32_t WfMenuMenuItem::fuzzy_match(Glib::ustring pattern)
+uint32_t WfMenuItem::fuzzy_match(Glib::ustring pattern)
 {
     uint32_t match_score = 0;
     Glib::ustring name   = app_info->get_name();
@@ -250,7 +264,7 @@ uint32_t WfMenuMenuItem::fuzzy_match(Glib::ustring pattern)
     return match_score;
 }
 
-uint32_t WfMenuMenuItem::matches(Glib::ustring pattern)
+uint32_t WfMenuItem::matches(Glib::ustring pattern)
 {
     uint32_t match_score    = 0;
     Glib::ustring long_name = app_info->get_display_name();
@@ -291,7 +305,7 @@ uint32_t WfMenuMenuItem::matches(Glib::ustring pattern)
     return match_score;
 }
 
-bool WfMenuMenuItem::operator <(const WfMenuMenuItem& other)
+bool WfMenuItem::operator <(const WfMenuItem& other)
 {
     return Glib::ustring(app_info->get_name()).lowercase() <
            Glib::ustring(other.app_info->get_name()).lowercase();
@@ -395,7 +409,7 @@ void WayfireMenu::populate_menu_items(std::string category)
 
     for (auto app_info : category_list[category]->items)
     {
-        auto app = new WfMenuMenuItem(this, app_info);
+        auto app = new WfMenuItem(this, app_info);
         flowbox.append(*app);
     }
 }
@@ -491,7 +505,7 @@ void WayfireMenu::on_search_changed()
 
 bool WayfireMenu::on_filter(Gtk::FlowBoxChild *child)
 {
-    auto button = dynamic_cast<WfMenuMenuItem*>(child);
+    auto button = dynamic_cast<WfMenuItem*>(child);
     assert(button);
 
     auto text = search_contents;
@@ -510,8 +524,8 @@ bool WayfireMenu::on_filter(Gtk::FlowBoxChild *child)
 
 bool WayfireMenu::on_sort(Gtk::FlowBoxChild *a, Gtk::FlowBoxChild *b)
 {
-    auto b1 = dynamic_cast<WfMenuMenuItem*>(a);
-    auto b2 = dynamic_cast<WfMenuMenuItem*>(b);
+    auto b1 = dynamic_cast<WfMenuItem*>(a);
+    auto b2 = dynamic_cast<WfMenuItem*>(b);
     assert(b1 && b2);
 
     if (m_sort_names)
@@ -604,7 +618,7 @@ void WayfireMenu::setup_popover_layout()
             auto children = flowbox.get_selected_children();
             if (children.size() == 1)
             {
-                auto child = dynamic_cast<WfMenuMenuItem*>(children[0]);
+                auto child = dynamic_cast<WfMenuItem*>(children[0]);
                 child->on_click();
             }
 
@@ -662,6 +676,14 @@ void WayfireMenu::update_popover_layout()
     popover_layout_box.remove(separator);
     popover_layout_box.remove(box_bottom);
 
+    if (menu_list)
+    {
+        flowbox.set_max_children_per_line(1);
+    } else
+    {
+        flowbox.set_max_children_per_line(9999);
+    }
+
     if ((std::string)panel_position == WF_WINDOW_POSITION_TOP)
     {
         popover_layout_box.append(search_entry);
@@ -995,7 +1017,7 @@ void WayfireMenu::select_first_flowbox_item()
     auto child = flowbox.get_child_at_index(0);
     if (child)
     {
-        auto cast_child = dynamic_cast<WfMenuMenuItem*>(child);
+        auto cast_child = dynamic_cast<WfMenuItem*>(child);
         if (cast_child)
         {
             flowbox.select_child(*cast_child);
diff --git a/src/panel/widgets/menu.hpp b/src/panel/widgets/menu.hpp
index 113ac1825..6108cd1b4 100644
--- a/src/panel/widgets/menu.hpp
+++ b/src/panel/widgets/menu.hpp
@@ -6,6 +6,8 @@
 #include <set>
 
 #include "../widget.hpp"
+#include "gtkmm/enums.h"
+#include "gtkmm/orientable.h"
 #include "wf-popover.hpp"
 
 class WayfireMenu;
@@ -43,15 +45,15 @@ class WfMenuCategoryButton : public Gtk::Button
     void on_click();
 };
 
-class WfMenuMenuItem : public Gtk::FlowBoxChild
+class WfMenuItem : public Gtk::FlowBoxChild
 {
   public:
-    WfMenuMenuItem(WayfireMenu *menu, AppInfo app);
-    ~WfMenuMenuItem();
+    WfMenuItem(WayfireMenu *menu, AppInfo app);
+    ~WfMenuItem();
 
     uint32_t matches(Glib::ustring text);
     uint32_t fuzzy_match(Glib::ustring text);
-    bool operator <(const WfMenuMenuItem& other);
+    bool operator <(const WfMenuItem& other);
     void set_search_value(uint32_t value);
     uint32_t get_search_value();
     void on_click();
@@ -61,9 +63,9 @@ class WfMenuMenuItem : public Gtk::FlowBoxChild
     Gtk::Box box;
     Gtk::Image image;
     Gtk::Label label;
-    Gtk::Overlay overlay; // only for the grid mode, not list
     Glib::RefPtr<Gio::Menu> m_menu;
     Glib::RefPtr<Gio::SimpleActionGroup> actions;
+    Gtk::Button button;
     Gtk::MenuButton extra_actions_button;
     std::vector<sigc::connection> signals;
 

From dba61a0015849bcf989a2b7678aa9f695bc31ef5 Mon Sep 17 00:00:00 2001
From: Hue <skeptikal.monke@gmail.com>
Date: Sun, 22 Feb 2026 00:08:46 +0100
Subject: [PATCH 03/15] how about this set of bugs

---
 src/panel/widgets/menu.cpp | 41 ++++++++++++++++----------------------
 src/panel/widgets/menu.hpp |  2 --
 2 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/src/panel/widgets/menu.cpp b/src/panel/widgets/menu.cpp
index fc73c1d90..4f6b376a2 100644
--- a/src/panel/widgets/menu.cpp
+++ b/src/panel/widgets/menu.cpp
@@ -467,11 +467,9 @@ void WayfireMenu::load_menu_items_all()
 
 void WayfireMenu::on_search_changed()
 {
-    search_entry.set_text(search_contents);
-    search_entry.set_position(search_contents.length());
     if (menu_show_categories)
     {
-        if (search_contents.length() == 0)
+        if (search_entry.get_text().length() == 0)
         {
             /* Text has been unset, show categories again */
             populate_menu_items(category);
@@ -484,7 +482,7 @@ void WayfireMenu::on_search_changed()
         }
     }
 
-    m_sort_names  = search_contents.length() == 0;
+    m_sort_names  = search_entry.get_text().length() == 0;
     fuzzy_filter  = false;
     count_matches = 0;
     flowbox.unselect_all();
@@ -508,7 +506,7 @@ bool WayfireMenu::on_filter(Gtk::FlowBoxChild *child)
     auto button = dynamic_cast<WfMenuItem*>(child);
     assert(button);
 
-    auto text = search_contents;
+    auto text = search_entry.get_text();
     uint32_t match_score = this->fuzzy_filter ?
         button->fuzzy_match(text) : button->matches(text);
 
@@ -538,7 +536,7 @@ bool WayfireMenu::on_sort(Gtk::FlowBoxChild *a, Gtk::FlowBoxChild *b)
 
 void WayfireMenu::on_popover_shown()
 {
-    search_contents = "";
+    search_entry.delete_text(0, search_entry.get_text_length());
     on_search_changed();
     set_category("All");
     flowbox.unselect_all();
@@ -604,16 +602,7 @@ void WayfireMenu::setup_popover_layout()
     signals.push_back(typing_gesture->signal_key_pressed().connect([=] (guint keyval, guint keycode,
                                                                         Gdk::ModifierType state)
     {
-        if (keyval == GDK_KEY_BackSpace)
-        {
-            if (search_contents.length() > 0)
-            {
-                search_contents.pop_back();
-            }
-
-            on_search_changed();
-            return true;
-        } else if ((keyval == GDK_KEY_Return) || (keyval == GDK_KEY_KP_Enter))
+        if ((keyval == GDK_KEY_Return) || (keyval == GDK_KEY_KP_Enter))
         {
             auto children = flowbox.get_selected_children();
             if (children.size() == 1)
@@ -626,15 +615,20 @@ void WayfireMenu::setup_popover_layout()
         } else if (keyval == GDK_KEY_Escape)
         {
             button->get_popover()->hide();
+        } 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())
+        {
+            on_search_changed();
+            return false;
         } else
         {
-            std::string input = gdk_keyval_name(keyval);
-            if (input.length() == 1)
-            {
-                search_contents = search_contents + input;
-                on_search_changed();
-                return true;
-            }
+            search_entry.grab_focus();
+            on_search_changed();
         }
 
         return false;
@@ -990,7 +984,6 @@ void WayfireMenu::update_content_width()
 
 void WayfireMenu::toggle_menu()
 {
-    search_contents = "";
     search_entry.set_text("");
     if (button->get_active())
     {
diff --git a/src/panel/widgets/menu.hpp b/src/panel/widgets/menu.hpp
index 6108cd1b4..bf097b655 100644
--- a/src/panel/widgets/menu.hpp
+++ b/src/panel/widgets/menu.hpp
@@ -122,8 +122,6 @@ class WayfireMenu : public WayfireWidget
 {
     WayfireOutput *output;
 
-    std::string search_contents = "";
-
     Gtk::Box flowbox_container;
     Gtk::Box box, box_bottom, scroll_pair;
     Gtk::Box bottom_pad;

From 9f14dc99dceac4a11d10f2c2e781b3a02bd5698e Mon Sep 17 00:00:00 2001
From: Hue <skeptikal.monke@gmail.com>
Date: Sun, 22 Feb 2026 00:43:36 +0100
Subject: [PATCH 04/15] adjust styles

---
 src/panel/panel.cpp        | 2 +-
 src/panel/widgets/menu.cpp | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/panel/panel.cpp b/src/panel/panel.cpp
index 6cd468d87..16fe410d0 100644
--- a/src/panel/panel.cpp
+++ b/src/panel/panel.cpp
@@ -526,7 +526,7 @@ void WayfirePanelApp::on_activate()
     {
         {"panel/minimal_height", ""},
         {"panel/menu_icon_size", ".menu-icon"},
-        {"panel/menu_item_icon_size", ".app-button-icon"},
+        {"panel/menu_item_icon_size", ".app-button"},
         {"panel/launchers_size", ".launcher"},
         {"panel/battery_icon_size", ".battery image"},
         {"panel/network_icon_size", ".network"},
diff --git a/src/panel/widgets/menu.cpp b/src/panel/widgets/menu.cpp
index 4f6b376a2..39389634d 100644
--- a/src/panel/widgets/menu.cpp
+++ b/src/panel/widgets/menu.cpp
@@ -62,8 +62,6 @@ void WfMenuCategoryButton::on_click()
 WfMenuItem::WfMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppInfo> app) :
     Gtk::FlowBoxChild(), menu(_menu), app_info(app)
 {
-    add_css_class("app-button");
-
     image.set((const Glib::RefPtr<const Gio::Icon>&)app->get_icon());
 
     label.set_text(app->get_name());
@@ -79,7 +77,7 @@ WfMenuItem::WfMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppInfo> app
     box.set_expand(false);
     box.add_css_class("flat");
     box.add_css_class("widget-icon");
-    box.add_css_class("app-button-icon");
+    box.add_css_class("app-button");
 
     set_child(box);
 

From df1083ccef1a271c42804f77032386fdcab0ee42 Mon Sep 17 00:00:00 2001
From: Hue <skeptikal.monke@gmail.com>
Date: Sun, 22 Feb 2026 00:52:39 +0100
Subject: [PATCH 05/15] spacing option

---
 metadata/panel.xml         | 5 +++++
 src/panel/widgets/menu.cpp | 4 +++-
 src/panel/widgets/menu.hpp | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/metadata/panel.xml b/metadata/panel.xml
index 7a94daed8..80fb6c861 100644
--- a/metadata/panel.xml
+++ b/metadata/panel.xml
@@ -199,6 +199,11 @@
 		<default>48</default>
 		<min>0</min>
 	</option>
+	<option name="menu_item_spacing" type="int">
+		<_short>Space between menu items</_short>
+		<default>8</default>
+		<min>0</min>
+	</option>
 	<option name="menu_min_category_width" type="int">
 		<_short>Menu Minimum Category Width</_short>
 		<default>200</default>
diff --git a/src/panel/widgets/menu.cpp b/src/panel/widgets/menu.cpp
index 39389634d..dfe7017e9 100644
--- a/src/panel/widgets/menu.cpp
+++ b/src/panel/widgets/menu.cpp
@@ -673,9 +673,10 @@ void WayfireMenu::update_popover_layout()
         flowbox.set_max_children_per_line(1);
     } else
     {
-        flowbox.set_max_children_per_line(9999);
+        flowbox.set_max_children_per_line(0);
     }
 
+
     if ((std::string)panel_position == WF_WINDOW_POSITION_TOP)
     {
         popover_layout_box.append(search_entry);
@@ -902,6 +903,7 @@ void WayfireMenu::init(Gtk::Box *container)
 
     // configuration reloading callbacks
     menu_icon.set_callback([=] () { update_icon(); });
+    flowbox_spacing.set_callback([=] () { flowbox.set_column_spacing(flowbox_spacing.value()); flowbox.set_column_spacing(flowbox_spacing.value());});
     menu_min_category_width.set_callback([=] () { update_category_width(); });
     menu_min_content_height.set_callback([=] () { update_content_height(); });
     menu_min_content_width.set_callback([=] () { update_content_width(); });
diff --git a/src/panel/widgets/menu.hpp b/src/panel/widgets/menu.hpp
index bf097b655..d1d23dc92 100644
--- a/src/panel/widgets/menu.hpp
+++ b/src/panel/widgets/menu.hpp
@@ -173,6 +173,7 @@ class WayfireMenu : public WayfireWidget
     WfOption<bool> fuzzy_search_enabled{"panel/menu_fuzzy_search"};
     WfOption<std::string> panel_position{"panel/position"};
     WfOption<std::string> menu_icon{"panel/menu_icon"};
+    WfOption<int> flowbox_spacing{"panel/menu_item_spacing"};
     WfOption<int> menu_min_category_width{"panel/menu_min_category_width"};
     WfOption<int> menu_min_content_height{"panel/menu_min_content_height"};
     WfOption<bool> menu_show_categories{"panel/menu_show_categories"};

From b9fe9777cf603103279029b38e0547183d902a1e Mon Sep 17 00:00:00 2001
From: Hue <skeptikal.monke@gmail.com>
Date: Sun, 22 Feb 2026 01:06:48 +0100
Subject: [PATCH 06/15] use .value on every WfOption and clean headers

---
 src/panel/widgets/menu.cpp | 49 +++++++++++++++++++-------------------
 src/panel/widgets/menu.hpp |  2 --
 2 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/src/panel/widgets/menu.cpp b/src/panel/widgets/menu.cpp
index dfe7017e9..7df3e8d20 100644
--- a/src/panel/widgets/menu.cpp
+++ b/src/panel/widgets/menu.cpp
@@ -68,7 +68,6 @@ WfMenuItem::WfMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppInfo> app
     label.set_ellipsize(Pango::EllipsizeMode::END);
     label.set_max_width_chars(0);
 
-
     extra_actions_button.add_css_class("flat");
     extra_actions_button.add_css_class("app-button-extras");
     extra_actions_button.set_direction(Gtk::ArrowType::RIGHT);
@@ -81,7 +80,7 @@ WfMenuItem::WfMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppInfo> app
 
     set_child(box);
 
-    if (menu->menu_list)
+    if (menu->menu_list.value())
     {
         label.set_hexpand(true);
         label.set_halign(Gtk::Align::START);
@@ -465,14 +464,14 @@ void WayfireMenu::load_menu_items_all()
 
 void WayfireMenu::on_search_changed()
 {
-    if (menu_show_categories)
+    if (menu_show_categories.value())
     {
         if (search_entry.get_text().length() == 0)
         {
             /* Text has been unset, show categories again */
             populate_menu_items(category);
             category_scrolled_window.show();
-            app_scrolled_window.set_min_content_width(int(menu_min_content_width));
+            app_scrolled_window.set_min_content_width(menu_min_content_width.value());
         } else
         {
             /* User is filtering, hide categories, ignore chosen category */
@@ -488,7 +487,7 @@ void WayfireMenu::on_search_changed()
     flowbox.invalidate_sort();
 
     /* We got no matches, try to fuzzy-match */
-    if ((count_matches <= 0) && fuzzy_search_enabled)
+    if ((count_matches <= 0) && fuzzy_search_enabled.value())
     {
         fuzzy_filter = true;
         flowbox.unselect_all();
@@ -547,7 +546,7 @@ void WayfireMenu::on_popover_shown()
 bool WayfireMenu::update_icon()
 {
     std::string icon;
-    if (((std::string)menu_icon).empty())
+    if ((menu_icon.value()).empty())
     {
         icon = default_icon;
     } else
@@ -570,7 +569,7 @@ void WayfireMenu::setup_popover_layout()
     flowbox.set_sort_func(sigc::mem_fun(*this, &WayfireMenu::on_sort));
     flowbox.set_filter_func(sigc::mem_fun(*this, &WayfireMenu::on_filter));
     flowbox.add_css_class("app-list");
-    flowbox.set_size_request(int(menu_min_content_width), int(menu_min_content_height));
+    flowbox.set_size_request(menu_min_content_width.value(), menu_min_content_height.value());
 
     flowbox_container.append(flowbox);
 
@@ -578,8 +577,8 @@ void WayfireMenu::setup_popover_layout()
     scroll_pair.append(app_scrolled_window);
     scroll_pair.set_homogeneous(false);
 
-    app_scrolled_window.set_min_content_width(int(menu_min_content_width));
-    app_scrolled_window.set_min_content_height(int(menu_min_content_height));
+    app_scrolled_window.set_min_content_width(menu_min_content_width.value());
+    app_scrolled_window.set_min_content_height(menu_min_content_height.value());
     app_scrolled_window.set_child(flowbox_container);
     app_scrolled_window.add_css_class("app-list-scroll");
     app_scrolled_window.set_policy(Gtk::PolicyType::NEVER, Gtk::PolicyType::AUTOMATIC);
@@ -587,8 +586,8 @@ void WayfireMenu::setup_popover_layout()
     category_box.add_css_class("category-list");
     category_box.set_orientation(Gtk::Orientation::VERTICAL);
 
-    category_scrolled_window.set_min_content_width(int(menu_min_category_width));
-    category_scrolled_window.set_min_content_height(int(menu_min_content_height));
+    category_scrolled_window.set_min_content_width(menu_min_category_width.value());
+    category_scrolled_window.set_min_content_height(menu_min_content_height.value());
     category_scrolled_window.set_child(category_box);
     category_scrolled_window.add_css_class("categtory-list-scroll");
     category_scrolled_window.set_policy(Gtk::PolicyType::NEVER, Gtk::PolicyType::AUTOMATIC);
@@ -668,7 +667,7 @@ void WayfireMenu::update_popover_layout()
     popover_layout_box.remove(separator);
     popover_layout_box.remove(box_bottom);
 
-    if (menu_list)
+    if (menu_list.value())
     {
         flowbox.set_max_children_per_line(1);
     } else
@@ -677,7 +676,7 @@ void WayfireMenu::update_popover_layout()
     }
 
 
-    if ((std::string)panel_position == WF_WINDOW_POSITION_TOP)
+    if (panel_position.value() == WF_WINDOW_POSITION_TOP)
     {
         popover_layout_box.append(search_entry);
         popover_layout_box.append(scroll_pair);
@@ -691,7 +690,7 @@ void WayfireMenu::update_popover_layout()
         popover_layout_box.append(box_bottom);
     }
 
-    if (!menu_show_categories)
+    if (!menu_show_categories.value())
     {
         category_scrolled_window.hide();
     }
@@ -700,37 +699,37 @@ void WayfireMenu::update_popover_layout()
 void WayfireLogoutUI::on_logout_click()
 {
     ui.hide();
-    g_spawn_command_line_async(std::string(logout_command).c_str(), NULL);
+    g_spawn_command_line_async(logout_command.value().c_str(), NULL);
 }
 
 void WayfireLogoutUI::on_reboot_click()
 {
     ui.hide();
-    g_spawn_command_line_async(std::string(reboot_command).c_str(), NULL);
+    g_spawn_command_line_async(reboot_command.value().c_str(), NULL);
 }
 
 void WayfireLogoutUI::on_shutdown_click()
 {
     ui.hide();
-    g_spawn_command_line_async(std::string(shutdown_command).c_str(), NULL);
+    g_spawn_command_line_async(shutdown_command.value().c_str(), NULL);
 }
 
 void WayfireLogoutUI::on_suspend_click()
 {
     ui.hide();
-    g_spawn_command_line_async(std::string(suspend_command).c_str(), NULL);
+    g_spawn_command_line_async(suspend_command.value().c_str(), NULL);
 }
 
 void WayfireLogoutUI::on_hibernate_click()
 {
     ui.hide();
-    g_spawn_command_line_async(std::string(hibernate_command).c_str(), NULL);
+    g_spawn_command_line_async(hibernate_command.value().c_str(), NULL);
 }
 
 void WayfireLogoutUI::on_switchuser_click()
 {
     ui.hide();
-    g_spawn_command_line_async(std::string(switchuser_command).c_str(), NULL);
+    g_spawn_command_line_async(switchuser_command.value().c_str(), NULL);
 }
 
 void WayfireLogoutUI::on_cancel_click()
@@ -831,7 +830,7 @@ void WayfireMenu::on_logout_click()
     button->get_popover()->hide();
     if (!std::string(menu_logout_command).empty())
     {
-        g_spawn_command_line_async(std::string(menu_logout_command).c_str(), NULL);
+        g_spawn_command_line_async(menu_logout_command.value().c_str(), NULL);
         return;
     }
 
@@ -968,18 +967,18 @@ void WayfireMenu::init(Gtk::Box *container)
 
 void WayfireMenu::update_category_width()
 {
-    category_scrolled_window.set_min_content_width(int(menu_min_category_width));
+    category_scrolled_window.set_min_content_width(menu_min_category_width.value());
 }
 
 void WayfireMenu::update_content_height()
 {
-    category_scrolled_window.set_min_content_height(int(menu_min_content_height));
-    app_scrolled_window.set_min_content_height(int(menu_min_content_height));
+    category_scrolled_window.set_min_content_height(menu_min_content_height.value());
+    app_scrolled_window.set_min_content_height(menu_min_content_height.value());
 }
 
 void WayfireMenu::update_content_width()
 {
-    app_scrolled_window.set_min_content_width(int(menu_min_content_width));
+    app_scrolled_window.set_min_content_width(menu_min_content_width.value());
 }
 
 void WayfireMenu::toggle_menu()
diff --git a/src/panel/widgets/menu.hpp b/src/panel/widgets/menu.hpp
index d1d23dc92..23b59e166 100644
--- a/src/panel/widgets/menu.hpp
+++ b/src/panel/widgets/menu.hpp
@@ -6,8 +6,6 @@
 #include <set>
 
 #include "../widget.hpp"
-#include "gtkmm/enums.h"
-#include "gtkmm/orientable.h"
 #include "wf-popover.hpp"
 
 class WayfireMenu;

From a1ef00206a0da856ca3432fa2a71c7c3332dca2d Mon Sep 17 00:00:00 2001
From: Hue <skeptikal.monke@gmail.com>
Date: Sun, 22 Feb 2026 01:10:30 +0100
Subject: [PATCH 07/15] uncrustify

---
 src/panel/widgets/menu.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/panel/widgets/menu.cpp b/src/panel/widgets/menu.cpp
index 7df3e8d20..caafe99da 100644
--- a/src/panel/widgets/menu.cpp
+++ b/src/panel/widgets/menu.cpp
@@ -158,7 +158,7 @@ WfMenuItem::WfMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppInfo> app
         left_click_g->set_state(Gtk::EventSequenceState::CLAIMED);
     }));
     signals.push_back(right_click_g->signal_pressed().connect(
-        [=] (int c,double x, double y)
+        [=] (int c, double x, double y)
     {
         extra_actions_button.activate();
         right_click_g->set_state(Gtk::EventSequenceState::CLAIMED);
@@ -612,10 +612,10 @@ void WayfireMenu::setup_popover_layout()
         } else if (keyval == GDK_KEY_Escape)
         {
             button->get_popover()->hide();
-        } else if (keyval == GDK_KEY_Up ||
-                   keyval == GDK_KEY_Down ||
-                   keyval == GDK_KEY_Left ||
-                   keyval == GDK_KEY_Right)
+        } 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())
@@ -675,7 +675,6 @@ void WayfireMenu::update_popover_layout()
         flowbox.set_max_children_per_line(0);
     }
 
-
     if (panel_position.value() == WF_WINDOW_POSITION_TOP)
     {
         popover_layout_box.append(search_entry);
@@ -902,7 +901,11 @@ void WayfireMenu::init(Gtk::Box *container)
 
     // configuration reloading callbacks
     menu_icon.set_callback([=] () { update_icon(); });
-    flowbox_spacing.set_callback([=] () { flowbox.set_column_spacing(flowbox_spacing.value()); flowbox.set_column_spacing(flowbox_spacing.value());});
+    flowbox_spacing.set_callback([=] ()
+    {
+        flowbox.set_column_spacing(flowbox_spacing.value());
+        flowbox.set_column_spacing(flowbox_spacing.value());
+    });
     menu_min_category_width.set_callback([=] () { update_category_width(); });
     menu_min_content_height.set_callback([=] () { update_content_height(); });
     menu_min_content_width.set_callback([=] () { update_content_width(); });

From ce59aedaba4fa9422c72838596cc4afdd1c7d2e0 Mon Sep 17 00:00:00 2001
From: Hue <skeptikal.monke@gmail.com>
Date: Sun, 22 Feb 2026 01:16:52 +0100
Subject: [PATCH 08/15] fix search being old by 1 character

---
 src/panel/widgets/menu.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/panel/widgets/menu.cpp b/src/panel/widgets/menu.cpp
index caafe99da..8bbdda6ce 100644
--- a/src/panel/widgets/menu.cpp
+++ b/src/panel/widgets/menu.cpp
@@ -594,6 +594,12 @@ void WayfireMenu::setup_popover_layout()
 
     search_entry.add_css_class("app-search");
 
+    signals.push_back((search_entry.signal_changed().connect(
+        [this] ()
+        {
+            on_search_changed();
+        }
+    )));
     auto typing_gesture = Gtk::EventControllerKey::create();
     typing_gesture->set_propagation_phase(Gtk::PropagationPhase::CAPTURE);
     signals.push_back(typing_gesture->signal_key_pressed().connect([=] (guint keyval, guint keycode,
@@ -620,7 +626,6 @@ void WayfireMenu::setup_popover_layout()
             return false;
         } else if (search_entry.has_focus())
         {
-            on_search_changed();
             return false;
         } else
         {

From 3a9128b2709034397c6d2f170712d792f3b583d4 Mon Sep 17 00:00:00 2001
From: Hue <skeptikal.monke@gmail.com>
Date: Sun, 22 Feb 2026 01:18:54 +0100
Subject: [PATCH 09/15] uncrustify

---
 src/panel/widgets/menu.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/panel/widgets/menu.cpp b/src/panel/widgets/menu.cpp
index 8bbdda6ce..cd9971dd5 100644
--- a/src/panel/widgets/menu.cpp
+++ b/src/panel/widgets/menu.cpp
@@ -596,10 +596,9 @@ void WayfireMenu::setup_popover_layout()
 
     signals.push_back((search_entry.signal_changed().connect(
         [this] ()
-        {
-            on_search_changed();
-        }
-    )));
+    {
+        on_search_changed();
+    })));
     auto typing_gesture = Gtk::EventControllerKey::create();
     typing_gesture->set_propagation_phase(Gtk::PropagationPhase::CAPTURE);
     signals.push_back(typing_gesture->signal_key_pressed().connect([=] (guint keyval, guint keycode,

From 904da100741c3e24e1b6f9477e81aa8b4ca82e24 Mon Sep 17 00:00:00 2001
From: Hue <skeptikal.monke@gmail.com>
Date: Sun, 22 Feb 2026 17:03:12 +0100
Subject: [PATCH 10/15] fix flowbox reset, inactive actions and list mode
 arrows

---
 src/panel/widgets/menu.cpp | 81 ++++++++++++++++++++++----------------
 src/panel/widgets/menu.hpp |  2 +-
 2 files changed, 47 insertions(+), 36 deletions(-)

diff --git a/src/panel/widgets/menu.cpp b/src/panel/widgets/menu.cpp
index cd9971dd5..95f4f6003 100644
--- a/src/panel/widgets/menu.cpp
+++ b/src/panel/widgets/menu.cpp
@@ -80,15 +80,53 @@ WfMenuItem::WfMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppInfo> app
 
     set_child(box);
 
+    auto left_click_g  = Gtk::GestureClick::create();
+    auto right_click_g = Gtk::GestureClick::create();
+    auto long_press_g  = Gtk::GestureLongPress::create();
+    left_click_g->set_button(1);
+    right_click_g->set_button(3);
+    long_press_g->set_touch_only(true);
+
+    signals.push_back(left_click_g->signal_pressed().connect(
+        [=] (int c, double x, double y)
+    {
+        on_click();
+        left_click_g->set_state(Gtk::EventSequenceState::CLAIMED);
+    }));
+    signals.push_back(right_click_g->signal_pressed().connect(
+        [=] (int c, double x, double y)
+    {
+        extra_actions_button.activate();
+        right_click_g->set_state(Gtk::EventSequenceState::CLAIMED);
+    }));
+    signals.push_back(long_press_g->signal_pressed().connect(
+        [=] (double x, double y)
+    {
+        extra_actions_button.activate();
+        long_press_g->set_state(Gtk::EventSequenceState::CLAIMED);
+        left_click_g->set_state(Gtk::EventSequenceState::DENIED);
+        right_click_g->set_state(Gtk::EventSequenceState::DENIED);
+    }));
+
     if (menu->menu_list.value())
     {
+
         label.set_hexpand(true);
         label.set_halign(Gtk::Align::START);
         box.set_orientation(Gtk::Orientation::HORIZONTAL);
-        box.append(image);
-        box.append(label);
         extra_actions_button.set_halign(Gtk::Align::END);
         extra_actions_button.set_icon_name("arrow-right");
+        button.add_css_class("flat");
+
+        list_item.append(image);
+        list_item.append(label);
+        button.set_child(list_item);
+
+        list_item.add_controller(left_click_g);
+        list_item.add_controller(right_click_g);
+        list_item.add_controller(long_press_g);
+
+        box.append(button);
         box.append(extra_actions_button);
     } else
     {
@@ -104,6 +142,10 @@ WfMenuItem::WfMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppInfo> app
             box.append(extra_actions_button);
         }
 
+        box.add_controller(left_click_g);
+        box.add_controller(right_click_g);
+        box.add_controller(long_press_g);
+
         box.append(label);
     }
 
@@ -134,6 +176,7 @@ WfMenuItem::WfMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppInfo> app
     }
 
     extra_actions_button.set_menu_model(m_menu);
+    extra_actions_button.insert_action_group("app", actions);
 
     set_has_tooltip();
     signals.push_back(signal_query_tooltip().connect([=] (int x, int y, bool key_mode,
@@ -143,38 +186,6 @@ WfMenuItem::WfMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppInfo> app
         tooltip->set_text(app->get_name());
         return true;
     }, false));
-
-    auto left_click_g  = Gtk::GestureClick::create();
-    auto right_click_g = Gtk::GestureClick::create();
-    auto long_press_g  = Gtk::GestureLongPress::create();
-    left_click_g->set_button(1);
-    right_click_g->set_button(3);
-    long_press_g->set_touch_only(true);
-
-    signals.push_back(left_click_g->signal_pressed().connect(
-        [=] (int c, double x, double y)
-    {
-        on_click();
-        left_click_g->set_state(Gtk::EventSequenceState::CLAIMED);
-    }));
-    signals.push_back(right_click_g->signal_pressed().connect(
-        [=] (int c, double x, double y)
-    {
-        extra_actions_button.activate();
-        right_click_g->set_state(Gtk::EventSequenceState::CLAIMED);
-    }));
-    signals.push_back(long_press_g->signal_pressed().connect(
-        [=] (double x, double y)
-    {
-        extra_actions_button.activate();
-        long_press_g->set_state(Gtk::EventSequenceState::CLAIMED);
-        left_click_g->set_state(Gtk::EventSequenceState::DENIED);
-        right_click_g->set_state(Gtk::EventSequenceState::DENIED);
-    }));
-
-    box.add_controller(left_click_g);
-    box.add_controller(right_click_g);
-    box.add_controller(long_press_g);
 }
 
 WfMenuItem::~WfMenuItem()
@@ -676,7 +687,7 @@ void WayfireMenu::update_popover_layout()
         flowbox.set_max_children_per_line(1);
     } else
     {
-        flowbox.set_max_children_per_line(0);
+        flowbox.set_max_children_per_line(-1);
     }
 
     if (panel_position.value() == WF_WINDOW_POSITION_TOP)
diff --git a/src/panel/widgets/menu.hpp b/src/panel/widgets/menu.hpp
index 23b59e166..fc7d66e72 100644
--- a/src/panel/widgets/menu.hpp
+++ b/src/panel/widgets/menu.hpp
@@ -58,7 +58,7 @@ class WfMenuItem : public Gtk::FlowBoxChild
 
   private:
     WayfireMenu *menu;
-    Gtk::Box box;
+    Gtk::Box box, list_item;
     Gtk::Image image;
     Gtk::Label label;
     Glib::RefPtr<Gio::Menu> m_menu;

From 1f97b0723424043bc5ebbbadce5e869a338912bc Mon Sep 17 00:00:00 2001
From: Hue <skeptikal.monke@gmail.com>
Date: Sun, 22 Feb 2026 17:21:04 +0100
Subject: [PATCH 11/15] fixed elipsising for list

---
 src/panel/widgets/menu.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/panel/widgets/menu.cpp b/src/panel/widgets/menu.cpp
index 95f4f6003..859feb6a0 100644
--- a/src/panel/widgets/menu.cpp
+++ b/src/panel/widgets/menu.cpp
@@ -66,7 +66,6 @@ WfMenuItem::WfMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppInfo> app
 
     label.set_text(app->get_name());
     label.set_ellipsize(Pango::EllipsizeMode::END);
-    label.set_max_width_chars(0);
 
     extra_actions_button.add_css_class("flat");
     extra_actions_button.add_css_class("app-button-extras");
@@ -112,7 +111,12 @@ WfMenuItem::WfMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppInfo> app
     {
 
         label.set_hexpand(true);
+        label.set_halign(Gtk::Align::FILL);
         label.set_halign(Gtk::Align::START);
+        label.set_xalign(0.0);
+        list_item.set_hexpand(true);
+        box.set_hexpand(true);
+        set_hexpand(true);
         box.set_orientation(Gtk::Orientation::HORIZONTAL);
         extra_actions_button.set_halign(Gtk::Align::END);
         extra_actions_button.set_icon_name("arrow-right");
@@ -130,6 +134,7 @@ WfMenuItem::WfMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppInfo> app
         box.append(extra_actions_button);
     } else
     {
+        label.set_max_width_chars(0);
         box.set_orientation(Gtk::Orientation::VERTICAL);
         if (app->list_actions().size() == 0)
         {

From 91d511093e90ee82377b23bbd7776cf20827f65c Mon Sep 17 00:00:00 2001
From: Hue <skeptikal.monke@gmail.com>
Date: Sun, 22 Feb 2026 17:28:09 +0100
Subject: [PATCH 12/15] Revert "use .value on every WfOption and clean headers"

This reverts commit d200535a8976b48d1f873589f423fc6ad5e569e0.
---
 src/panel/widgets/menu.cpp | 49 +++++++++++++++++++-------------------
 src/panel/widgets/menu.hpp |  2 ++
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/src/panel/widgets/menu.cpp b/src/panel/widgets/menu.cpp
index 859feb6a0..5f7c6caf3 100644
--- a/src/panel/widgets/menu.cpp
+++ b/src/panel/widgets/menu.cpp
@@ -67,6 +67,7 @@ WfMenuItem::WfMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppInfo> app
     label.set_text(app->get_name());
     label.set_ellipsize(Pango::EllipsizeMode::END);
 
+
     extra_actions_button.add_css_class("flat");
     extra_actions_button.add_css_class("app-button-extras");
     extra_actions_button.set_direction(Gtk::ArrowType::RIGHT);
@@ -107,7 +108,7 @@ WfMenuItem::WfMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppInfo> app
         right_click_g->set_state(Gtk::EventSequenceState::DENIED);
     }));
 
-    if (menu->menu_list.value())
+    if (menu->menu_list)
     {
 
         label.set_hexpand(true);
@@ -480,14 +481,14 @@ void WayfireMenu::load_menu_items_all()
 
 void WayfireMenu::on_search_changed()
 {
-    if (menu_show_categories.value())
+    if (menu_show_categories)
     {
         if (search_entry.get_text().length() == 0)
         {
             /* Text has been unset, show categories again */
             populate_menu_items(category);
             category_scrolled_window.show();
-            app_scrolled_window.set_min_content_width(menu_min_content_width.value());
+            app_scrolled_window.set_min_content_width(int(menu_min_content_width));
         } else
         {
             /* User is filtering, hide categories, ignore chosen category */
@@ -503,7 +504,7 @@ void WayfireMenu::on_search_changed()
     flowbox.invalidate_sort();
 
     /* We got no matches, try to fuzzy-match */
-    if ((count_matches <= 0) && fuzzy_search_enabled.value())
+    if ((count_matches <= 0) && fuzzy_search_enabled)
     {
         fuzzy_filter = true;
         flowbox.unselect_all();
@@ -562,7 +563,7 @@ void WayfireMenu::on_popover_shown()
 bool WayfireMenu::update_icon()
 {
     std::string icon;
-    if ((menu_icon.value()).empty())
+    if (((std::string)menu_icon).empty())
     {
         icon = default_icon;
     } else
@@ -585,7 +586,7 @@ void WayfireMenu::setup_popover_layout()
     flowbox.set_sort_func(sigc::mem_fun(*this, &WayfireMenu::on_sort));
     flowbox.set_filter_func(sigc::mem_fun(*this, &WayfireMenu::on_filter));
     flowbox.add_css_class("app-list");
-    flowbox.set_size_request(menu_min_content_width.value(), menu_min_content_height.value());
+    flowbox.set_size_request(int(menu_min_content_width), int(menu_min_content_height));
 
     flowbox_container.append(flowbox);
 
@@ -593,8 +594,8 @@ void WayfireMenu::setup_popover_layout()
     scroll_pair.append(app_scrolled_window);
     scroll_pair.set_homogeneous(false);
 
-    app_scrolled_window.set_min_content_width(menu_min_content_width.value());
-    app_scrolled_window.set_min_content_height(menu_min_content_height.value());
+    app_scrolled_window.set_min_content_width(int(menu_min_content_width));
+    app_scrolled_window.set_min_content_height(int(menu_min_content_height));
     app_scrolled_window.set_child(flowbox_container);
     app_scrolled_window.add_css_class("app-list-scroll");
     app_scrolled_window.set_policy(Gtk::PolicyType::NEVER, Gtk::PolicyType::AUTOMATIC);
@@ -602,8 +603,8 @@ void WayfireMenu::setup_popover_layout()
     category_box.add_css_class("category-list");
     category_box.set_orientation(Gtk::Orientation::VERTICAL);
 
-    category_scrolled_window.set_min_content_width(menu_min_category_width.value());
-    category_scrolled_window.set_min_content_height(menu_min_content_height.value());
+    category_scrolled_window.set_min_content_width(int(menu_min_category_width));
+    category_scrolled_window.set_min_content_height(int(menu_min_content_height));
     category_scrolled_window.set_child(category_box);
     category_scrolled_window.add_css_class("categtory-list-scroll");
     category_scrolled_window.set_policy(Gtk::PolicyType::NEVER, Gtk::PolicyType::AUTOMATIC);
@@ -687,7 +688,7 @@ void WayfireMenu::update_popover_layout()
     popover_layout_box.remove(separator);
     popover_layout_box.remove(box_bottom);
 
-    if (menu_list.value())
+    if (menu_list)
     {
         flowbox.set_max_children_per_line(1);
     } else
@@ -695,7 +696,7 @@ void WayfireMenu::update_popover_layout()
         flowbox.set_max_children_per_line(-1);
     }
 
-    if (panel_position.value() == WF_WINDOW_POSITION_TOP)
+    if ((std::string)panel_position == WF_WINDOW_POSITION_TOP)
     {
         popover_layout_box.append(search_entry);
         popover_layout_box.append(scroll_pair);
@@ -709,7 +710,7 @@ void WayfireMenu::update_popover_layout()
         popover_layout_box.append(box_bottom);
     }
 
-    if (!menu_show_categories.value())
+    if (!menu_show_categories)
     {
         category_scrolled_window.hide();
     }
@@ -718,37 +719,37 @@ void WayfireMenu::update_popover_layout()
 void WayfireLogoutUI::on_logout_click()
 {
     ui.hide();
-    g_spawn_command_line_async(logout_command.value().c_str(), NULL);
+    g_spawn_command_line_async(std::string(logout_command).c_str(), NULL);
 }
 
 void WayfireLogoutUI::on_reboot_click()
 {
     ui.hide();
-    g_spawn_command_line_async(reboot_command.value().c_str(), NULL);
+    g_spawn_command_line_async(std::string(reboot_command).c_str(), NULL);
 }
 
 void WayfireLogoutUI::on_shutdown_click()
 {
     ui.hide();
-    g_spawn_command_line_async(shutdown_command.value().c_str(), NULL);
+    g_spawn_command_line_async(std::string(shutdown_command).c_str(), NULL);
 }
 
 void WayfireLogoutUI::on_suspend_click()
 {
     ui.hide();
-    g_spawn_command_line_async(suspend_command.value().c_str(), NULL);
+    g_spawn_command_line_async(std::string(suspend_command).c_str(), NULL);
 }
 
 void WayfireLogoutUI::on_hibernate_click()
 {
     ui.hide();
-    g_spawn_command_line_async(hibernate_command.value().c_str(), NULL);
+    g_spawn_command_line_async(std::string(hibernate_command).c_str(), NULL);
 }
 
 void WayfireLogoutUI::on_switchuser_click()
 {
     ui.hide();
-    g_spawn_command_line_async(switchuser_command.value().c_str(), NULL);
+    g_spawn_command_line_async(std::string(switchuser_command).c_str(), NULL);
 }
 
 void WayfireLogoutUI::on_cancel_click()
@@ -849,7 +850,7 @@ void WayfireMenu::on_logout_click()
     button->get_popover()->hide();
     if (!std::string(menu_logout_command).empty())
     {
-        g_spawn_command_line_async(menu_logout_command.value().c_str(), NULL);
+        g_spawn_command_line_async(std::string(menu_logout_command).c_str(), NULL);
         return;
     }
 
@@ -990,18 +991,18 @@ void WayfireMenu::init(Gtk::Box *container)
 
 void WayfireMenu::update_category_width()
 {
-    category_scrolled_window.set_min_content_width(menu_min_category_width.value());
+    category_scrolled_window.set_min_content_width(int(menu_min_category_width));
 }
 
 void WayfireMenu::update_content_height()
 {
-    category_scrolled_window.set_min_content_height(menu_min_content_height.value());
-    app_scrolled_window.set_min_content_height(menu_min_content_height.value());
+    category_scrolled_window.set_min_content_height(int(menu_min_content_height));
+    app_scrolled_window.set_min_content_height(int(menu_min_content_height));
 }
 
 void WayfireMenu::update_content_width()
 {
-    app_scrolled_window.set_min_content_width(menu_min_content_width.value());
+    app_scrolled_window.set_min_content_width(int(menu_min_content_width));
 }
 
 void WayfireMenu::toggle_menu()
diff --git a/src/panel/widgets/menu.hpp b/src/panel/widgets/menu.hpp
index fc7d66e72..a8d7cd7e9 100644
--- a/src/panel/widgets/menu.hpp
+++ b/src/panel/widgets/menu.hpp
@@ -6,6 +6,8 @@
 #include <set>
 
 #include "../widget.hpp"
+#include "gtkmm/enums.h"
+#include "gtkmm/orientable.h"
 #include "wf-popover.hpp"
 
 class WayfireMenu;

From 4520b33c476ce948d0386b8a6ea8401cadc2d05e Mon Sep 17 00:00:00 2001
From: Hue <skeptikal.monke@gmail.com>
Date: Sun, 22 Feb 2026 18:03:07 +0100
Subject: [PATCH 13/15] uncrustify

---
 src/panel/widgets/menu.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/panel/widgets/menu.cpp b/src/panel/widgets/menu.cpp
index 5f7c6caf3..157849382 100644
--- a/src/panel/widgets/menu.cpp
+++ b/src/panel/widgets/menu.cpp
@@ -110,7 +110,6 @@ WfMenuItem::WfMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppInfo> app
 
     if (menu->menu_list)
     {
-
         label.set_hexpand(true);
         label.set_halign(Gtk::Align::FILL);
         label.set_halign(Gtk::Align::START);

From 3b4c9efc21b2d1e07a43b84f594412c7a33becc2 Mon Sep 17 00:00:00 2001
From: Hue <skeptikal.monke@gmail.com>
Date: Mon, 23 Feb 2026 15:58:30 +0100
Subject: [PATCH 14/15] =?UTF-8?q?don=E2=80=99t=20uselessly=20deny=20right?=
 =?UTF-8?q?=20click?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/panel/widgets/menu.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/panel/widgets/menu.cpp b/src/panel/widgets/menu.cpp
index 157849382..5991def74 100644
--- a/src/panel/widgets/menu.cpp
+++ b/src/panel/widgets/menu.cpp
@@ -105,7 +105,6 @@ WfMenuItem::WfMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppInfo> app
         extra_actions_button.activate();
         long_press_g->set_state(Gtk::EventSequenceState::CLAIMED);
         left_click_g->set_state(Gtk::EventSequenceState::DENIED);
-        right_click_g->set_state(Gtk::EventSequenceState::DENIED);
     }));
 
     if (menu->menu_list)

From bc13d90b0b0d8df12e7165f3a7640e8c59288d43 Mon Sep 17 00:00:00 2001
From: Hue <skeptikal.monke@gmail.com>
Date: Fri, 27 Feb 2026 13:31:48 +0100
Subject: [PATCH 15/15] made the labels part of the buttons

---
 src/panel/widgets/menu.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/panel/widgets/menu.cpp b/src/panel/widgets/menu.cpp
index 5991def74..e694ba08a 100644
--- a/src/panel/widgets/menu.cpp
+++ b/src/panel/widgets/menu.cpp
@@ -67,7 +67,6 @@ WfMenuItem::WfMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppInfo> app
     label.set_text(app->get_name());
     label.set_ellipsize(Pango::EllipsizeMode::END);
 
-
     extra_actions_button.add_css_class("flat");
     extra_actions_button.add_css_class("app-button-extras");
     extra_actions_button.set_direction(Gtk::ArrowType::RIGHT);
@@ -78,8 +77,6 @@ WfMenuItem::WfMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppInfo> app
     box.add_css_class("widget-icon");
     box.add_css_class("app-button");
 
-    set_child(box);
-
     auto left_click_g  = Gtk::GestureClick::create();
     auto right_click_g = Gtk::GestureClick::create();
     auto long_press_g  = Gtk::GestureLongPress::create();
@@ -131,19 +128,23 @@ WfMenuItem::WfMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppInfo> app
 
         box.append(button);
         box.append(extra_actions_button);
+
+        set_child(box);
     } else
     {
         label.set_max_width_chars(0);
         box.set_orientation(Gtk::Orientation::VERTICAL);
+        box.append(image);
         if (app->list_actions().size() == 0)
         {
-            button.set_child(image);
+            button.set_child(box);
             button.add_css_class("flat");
-            box.append(button);
+            set_child(button);
         } else
         {
-            extra_actions_button.set_child(image);
-            box.append(extra_actions_button);
+            extra_actions_button.set_child(box);
+            extra_actions_button.add_css_class("flat");
+            set_child(extra_actions_button);
         }
 
         box.add_controller(left_click_g);