Don't use menubuttons where we don't want buttons

data/css/default.css

@@ -1,36 +1,35 @@
-.wf-panel .launcher,
-.wf-panel .launcher:hover,
-.wf-panel .tray-button,
-.wf-panel .tray-button:hover {
-    background: unset;
-    border: unset;
-    box-shadow: unset;
-    padding-left: unset;
-    padding-right: unset;
-}
-
 .wf-panel .tray-button image,
-.wf-panel .launcher image {
+.wf-panel image.launcher{
     transition: 500ms linear;
     -gtk-icon-transform: scale(0.8);
 }
 
-.wf-panel .launcher:hover image,
+.wf-panel image.launcher:hover,
 .wf-panel .tray-button:hover image {
     transition: 500ms linear;
-    -gtk-icon-transform: scale(1.2);
+    -gtk-icon-transform: scale(1.0);
 }
 
+/* FIXME: Makes a bad assumption about LTR reading direction. */
 .wf-panel .battery label,
 .wf-panel .battery:hover label,
 .wf-panel .window-button label,
+.wf-panel .window-button image,
 .wf-panel .window-button:hover label,
 .wf-panel .tray-button,
 .wf-panel .tray-button:hover,
 .wf-panel .notification button {
     padding-left: 5px;
 }
 
+.wf-panel .window-button.activated {
+    background-color: #8883;
+}
+
+.wf-panel .window-button:hover {
+    background-color: #8882;
+}
+
 .wf-panel .battery overlay label {
 --bcol: rgb(from currentcolor calc(255 - r) calc(255 - g) calc(255 - b) );
 text-shadow: 1px  1px 0 var(--bcol),
@@ -90,11 +89,11 @@ text-shadow: 1px  1px 0 var(--bcol),
     min-width: 48px;
 }
 
-.wf-panel .language label {
+.wf-panel label.language {
     background-color: #24283B;
     padding: 5px;
     margin: 5px;
-    border-radius: 3px; 
+    border-radius: 3px;
     color: #41A6B5;
 }
 
@@ -132,6 +131,15 @@ text-shadow: 1px  1px 0 var(--bcol),
     background-color: #00FFAA77;
     border: 1px solid #222;
 }
+
+.wf-panel .wf-menu.selected {
+    background-color:#8883;
+}
+
+.wf-panel .wf-menu:hover {
+    background-color: #8882;
+}
+
 .excellent>label {
     color: #00ff00;
 }

data/css/panel-window-list-zoom-hover.css

@@ -1,23 +1,23 @@
 /* Default size not-selected not-hovered */
-.wf-panel .window-button.flat image {
+.wf-panel .window-button image {
     transition: 500ms linear;
     -gtk-icon-transform: scale(1.0);
 }
 
 /* Double size not-selected hovered */
-.wf-panel .window-button.flat:hover image {
+.wf-panel .window-button:hover image {
     transition: 100ms linear;
     -gtk-icon-transform: scale(2.0);
 }
 
 /* +50% size selected not-hovered */
-.wf-panel .window-button image {
+.wf-panel .window-button.activated image {
     transition: 100ms linear;
     -gtk-icon-transform: scale(1.5);
 }
 
 /* Double size selected hovered */
-.wf-panel .window-button:hover image {
+.wf-panel .window-button.activated:hover image {
     transition: 100ms linear;
     -gtk-icon-transform: scale(2.0);
 }

metadata/panel.xml

@@ -122,6 +122,15 @@ If full_span is off, both sides of the panel will take the same amount of space,
 			<_name>Background</_name>
 		</desc>
 	</option>
+	<option name="force_show_popup" type="bool">
+		<_short>Force showing the popups</_short>
+		<_long>Show the popup over other windows, even if it and the panel would be hidden otherwise.</_long>
+		<default>true</default>
+	</option>
+	<option name="menus_change_motion" type="bool">
+		<_short>Change between open menu with mouse motion</_short>
+		<default>false</default>
+	</option>
 	<option name="background_color" type="string">
 		<_short>Background Color</_short>
 		<default>gtk_headerbar</default>
@@ -264,11 +273,6 @@ If full_span is off, both sides of the panel will take the same amount of space,
 		<default>8</default>
 		<min>0</min>
 	</option>
-	<option name="menu_force_show_popup" type="bool">
-		<_short>Force showing the menu popup</_short>
-		<_long>Show the menu popup over other windows, even if it and the panel would be hidden otherwise.</_long>
-		<default>true</default>
-	</option>
 	<option name="menu_min_category_width" type="int">
 		<_short>Menu Minimum Category Width</_short>
 		<default>200</default>
@@ -368,7 +372,7 @@ If full_span is off, both sides of the panel will take the same amount of space,
 	<option name="mixer_popup_timeout" type="double">
 		<_short>Popup timeout</_short>
 		<default>2.5</default>
-		<min>0</min>
+		<min>0.1</min>
 	</option>
 	<option name="mixer_slider_length" type="int">
 		<_short>Slider length</_short>

src/background/background.cpp

@@ -31,7 +31,7 @@ void WayfireBackground::setup_window()
     gtk_layer_set_anchor(gobj(), GTK_LAYER_SHELL_EDGE_BOTTOM, true);
     gtk_layer_set_anchor(gobj(), GTK_LAYER_SHELL_EDGE_LEFT, true);
     gtk_layer_set_anchor(gobj(), GTK_LAYER_SHELL_EDGE_RIGHT, true);
-    gtk_layer_set_keyboard_mode(gobj(), GTK_LAYER_SHELL_KEYBOARD_MODE_ON_DEMAND);
+    gtk_layer_set_keyboard_mode(gobj(), GTK_LAYER_SHELL_KEYBOARD_MODE_NONE);
 
     gtk_layer_set_exclusive_zone(gobj(), -1);
 

src/dock/dock.cpp

@@ -14,6 +14,7 @@
 #include "network/manager.hpp"
 #include "network/network-widget.hpp"
 #include "network/network.hpp"
+#include "wf-popover.hpp"
 #include <css-config.hpp>
 
 
@@ -23,7 +24,7 @@ class WfDock::impl
     std::unique_ptr<WayfireAutohidingWindow> window;
     wl_surface *_wl_surface;
     Gtk::FlowBox box;
-    std::unique_ptr<WayfireMenuButton> network_image;
+    std::unique_ptr<WayfireMenuWidget> network_image;
     std::unique_ptr<NetworkControlWidget> network_control;
     std::shared_ptr<NetworkManager> network_manager;
 

src/locker/plugin/volume.hpp

@@ -1,7 +1,6 @@
 #pragma once
 #include <memory>
 #include <gtkmm/button.h>
-#include <gtkmm/popover.h>
 #include <gtkmm/scale.h>
 #include <pulse/pulseaudio.h>
 

src/panel/panel.cpp

@@ -111,16 +111,20 @@ class WayfirePanel::impl
 
                 left_box.set_halign(Gtk::Align::END);
                 right_box.set_halign(Gtk::Align::START);
-                left_box.set_valign(Gtk::Align::CENTER);
-                right_box.set_valign(Gtk::Align::CENTER);
+                center_box.set_halign(Gtk::Align::CENTER);
+                left_box.set_valign(Gtk::Align::FILL);
+                right_box.set_valign(Gtk::Align::FILL);
+                center_box.set_valign(Gtk::Align::FILL);
             } else
             {
                 content_box.set_size_request(-1, (std::max(lnat, rnat) * 2) + mnat);
 
-                left_box.set_halign(Gtk::Align::CENTER);
-                right_box.set_halign(Gtk::Align::CENTER);
+                left_box.set_halign(Gtk::Align::FILL);
+                right_box.set_halign(Gtk::Align::FILL);
+                center_box.set_halign(Gtk::Align::FILL);
                 left_box.set_valign(Gtk::Align::END);
                 right_box.set_valign(Gtk::Align::START);
+                center_box.set_valign(Gtk::Align::CENTER);
             }
         } else
         {
@@ -133,14 +137,14 @@ class WayfirePanel::impl
             {
                 left_box.set_halign(Gtk::Align::START);
                 right_box.set_halign(Gtk::Align::END);
-                left_box.set_valign(Gtk::Align::CENTER);
-                right_box.set_valign(Gtk::Align::CENTER);
+                left_box.set_valign(Gtk::Align::FILL);
+                right_box.set_valign(Gtk::Align::FILL);
             } else
             {
                 left_box.set_valign(Gtk::Align::START);
                 right_box.set_valign(Gtk::Align::END);
-                left_box.set_halign(Gtk::Align::CENTER);
-                right_box.set_halign(Gtk::Align::CENTER);
+                left_box.set_halign(Gtk::Align::FILL);
+                right_box.set_halign(Gtk::Align::FILL);
             }
         }
     }
@@ -173,8 +177,6 @@ class WayfirePanel::impl
 
         content_box.set_hexpand(true);
         content_box.set_vexpand(true);
-        center_box.set_halign(Gtk::Align::CENTER);
-        center_box.set_valign(Gtk::Align::CENTER);
 
         window->set_child(content_box);
     }

src/panel/widgets/battery.cpp

@@ -139,14 +139,14 @@ void WayfireBatteryInfo::update_details()
         description += ", " + uint_to_time(time_to_empty.get()) + " remaining";
     }
 
-    button.set_tooltip_text(
+    box.set_tooltip_text(
         get_device_type_description(type.get()) + description);
 
     if (status_opt.value() == BATTERY_STATUS_PERCENT)
     {
         label.set_text(percentage_string);
         overlay.remove_overlay(label);
-        button_box.append(label);
+        box.append(label);
     } else if (status_opt.value() == BATTERY_STATUS_FULL)
     {
         label.set_text(description);
@@ -156,14 +156,14 @@ void WayfireBatteryInfo::update_details()
             overlay.remove_overlay(label);
         }
 
-        button_box.append(label);
+        box.append(label);
     } else if (status_opt.value() == BATTERY_STATUS_OVERLAY)
     {
         label.set_text(percentage_string);
-        auto children = button_box.get_children();
+        auto children = box.get_children();
         if (std::count(children.begin(), children.end(), &label))
         {
-            button_box.remove(label);
+            box.remove(label);
         }
 
         overlay.add_overlay(label);
@@ -231,10 +231,10 @@ void WayfireBatteryInfo::update_layout()
 
     if (panel_position.value() == PANEL_POSITION_LEFT or panel_position.value() == PANEL_POSITION_RIGHT)
     {
-        button_box.set_orientation(Gtk::Orientation::VERTICAL);
+        box.set_orientation(Gtk::Orientation::VERTICAL);
     } else
     {
-        button_box.set_orientation(Gtk::Orientation::HORIZONTAL);
+        box.set_orientation(Gtk::Orientation::HORIZONTAL);
     }
 }
 
@@ -252,22 +252,20 @@ void WayfireBatteryInfo::init(Gtk::Box *container)
         return;
     }
 
-    button_box.append(overlay);
+    box.append(overlay);
     overlay.set_child(icon);
     icon.add_css_class("widget-icon");
-    button.add_css_class("battery");
-    button.add_css_class("flat");
+    box.add_css_class("battery");
 
     status_opt.set_callback([=] () { update_details(); });
 
     update_details();
     update_icon();
 
-    container->append(button);
-    button_box.set_spacing(5);
+    container->append(box);
+    box.set_spacing(5);
 
-    button.set_child(button_box);
-    button.property_scale_factor().signal_changed()
+    icon.property_scale_factor().signal_changed()
         .connect(sigc::mem_fun(*this, &WayfireBatteryInfo::update_icon));
 
     update_layout();

src/panel/widgets/battery.hpp

@@ -28,9 +28,8 @@ class WayfireBatteryInfo : public WayfireWidget
 
     sigc::connection btn_sig, disp_dev_sig;
 
-    Gtk::Button button;
     Gtk::Label label;
-    Gtk::Box button_box;
+    Gtk::Box box;
     Gtk::Overlay overlay;
 
     Gtk::Image icon;

src/panel/widgets/clock.cpp

@@ -3,20 +3,18 @@
 
 void WayfireClock::init(Gtk::Box *container)
 {
-    button = std::make_unique<WayfireMenuButton>("panel");
+    button = std::make_unique<WayfireMenuWidget>("panel", "clock");
     button->add_css_class("clock");
-    button->set_child(label);
-    button->show();
+    button->append(label);
+    button->open_on(1);
     label.set_justify(Gtk::Justification::CENTER);
     label.show();
 
     update_label();
 
     calendar.show();
-    button->get_popover()->add_css_class("clock-popover");
-    button->get_children()[0]->add_css_class("flat");
-    button->get_popover()->set_child(calendar);
-    btn_sig = button->get_popover()->signal_show().connect(
+    button->set_popup_child(calendar);
+    btn_sig = button->signal_popup().connect(
         sigc::mem_fun(*this, &WayfireClock::on_calendar_shown));
 
     container->append(*button);
@@ -45,7 +43,7 @@ bool WayfireClock::update_label()
      * This could be circumvented with the modifiers the user passes to the
      * format string, * but to remove the requirement that the user does
      * something fancy, we just remove any leading spaces. */
-    int i = 0;
+    size_t i = 0;
     while (i < text.length() && text[i] == ' ')
     {
         i++;

src/panel/widgets/clock.hpp

@@ -9,7 +9,7 @@ class WayfireClock : public WayfireWidget
 {
     Gtk::Label label;
     Gtk::Calendar calendar;
-    std::unique_ptr<WayfireMenuButton> button;
+    std::unique_ptr<WayfireMenuWidget> button;
 
     sigc::connection timeout, btn_sig;
     WfOption<std::string> format{"panel/clock_format"};

src/panel/widgets/language.cpp

@@ -26,13 +26,17 @@ void WayfireLanguage::init(Gtk::Box *container)
         return;
     }
 
-    button.add_css_class("language");
-    button.add_css_class("flat");
-    button.remove_css_class("activated");
-    btn_sig = button.signal_clicked().connect(sigc::mem_fun(*this, &WayfireLanguage::next_layout));
-    button.show();
+    label.add_css_class("language");
+    auto click_gesture = Gtk::GestureClick::create();
+    click_gesture->set_button(1);
+    btn_sig = click_gesture->signal_released().connect(
+        [this] (int count, double x, double y)
+    {
+        next_layout();
+    });
+    label.add_controller(click_gesture);
 
-    container->append(button);
+    container->append(label);
 
     ipc_client->subscribe(this, {"keyboard-modifier-state-changed"});
     ipc_client->send("{\"method\":\"wayfire/get-keyboard-state\"}", [=] (wf::json_t data)
@@ -74,7 +78,7 @@ bool WayfireLanguage::update_label()
         return false;
     }
 
-    button.set_label(available_layouts[current_layout].ID);
+    label.set_label(available_layouts[current_layout].ID);
     return true;
 }