Skip to content

panel: menu: rejig menu items #545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
trigg wants to merge 1 commit into
base: master
Choose a base branch
from
Open

panel: menu: rejig menu items #545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions data/css/default.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
padding-left: 5px;
}

.wf-panel overlay.app-button {
padding:1em;
}

.wf-panel .window-button.activated {
background-color: #8883;
}
Expand Down
102 changes: 55 additions & 47 deletions src/panel/widgets/menu/item.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
WfMenuItem::WfMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppInfo> app) :
Gtk::FlowBoxChild(), menu(_menu), app_info(app)
{
overlay.set_child(box);
image.set((const Glib::RefPtr<const Gio::Icon>&)app->get_icon());
image.add_css_class("default-icon");
label.set_text(app->get_name());
Expand All @@ -16,8 +17,8 @@ WfMenuItem::WfMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppInfo> app
extra_actions_button.set_direction(Gtk::ArrowType::RIGHT);
extra_actions_button.set_has_frame(false);

box.set_expand(false);
box.add_css_class("app-button");
box.set_expand(true);
overlay.add_css_class("app-button");

auto left_click_g = Gtk::GestureClick::create();
auto right_click_g = Gtk::GestureClick::create();
Expand Down Expand Up @@ -52,59 +53,67 @@ WfMenuItem::WfMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppInfo> app
left_click_g->set_state(Gtk::EventSequenceState::DENIED);
}));

if (menu->menu_list)
/* Image and label in widget proper */
box.append(image);
box.append(label);

box.add_controller(left_click_g);
box.add_controller(right_click_g);
box.add_controller(long_press_g);
/* Alternatives in the corner */
overlay.add_overlay(extra_actions_button);

overlay.set_hexpand(true);
label.set_hexpand(true);
image.set_hexpand(false);
label.set_halign(Gtk::Align::FILL);
box.set_halign(Gtk::Align::FILL);
box.set_hexpand(true);
set_hexpand(true);

auto menu_list_callback = [=] ()
{
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");
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);

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)
if (menu_list.value())
{
button.set_child(box);
button.add_css_class("flat");
set_child(button);
label.set_xalign(0.0);
label.set_max_width_chars(100);
box.set_orientation(Gtk::Orientation::HORIZONTAL);
extra_actions_button.set_direction(Gtk::ArrowType::RIGHT);
extra_actions_button.set_icon_name("arrow-right");
extra_actions_button.set_halign(Gtk::Align::END);
extra_actions_button.set_valign(Gtk::Align::CENTER);
} else
{
extra_actions_button.set_child(box);
extra_actions_button.add_css_class("flat");
set_child(extra_actions_button);
label.set_xalign(0.5);
label.set_max_width_chars(0);
box.set_orientation(Gtk::Orientation::VERTICAL);
std::string position = panel_position.value();
if (position == "bottom")
{
extra_actions_button.set_direction(Gtk::ArrowType::UP);
extra_actions_button.set_icon_name("arrow-up");
} else
{
extra_actions_button.set_direction(Gtk::ArrowType::DOWN);
extra_actions_button.set_icon_name("arrow-down");
}

extra_actions_button.set_halign(Gtk::Align::END);
extra_actions_button.set_valign(Gtk::Align::END);
}
};

box.add_controller(left_click_g);
box.add_controller(right_click_g);
box.add_controller(long_press_g);

box.append(label);
if (app->list_actions().size() == 0)
{
extra_actions_button.hide();
}

menu_list_callback();
menu_list.set_callback(menu_list_callback);
panel_position.set_callback(menu_list_callback);

m_menu = Gio::Menu::create();
actions = Gio::SimpleActionGroup::create();
extra_actions_button.hide();

for (auto action : app->list_actions())
{
Expand All @@ -124,8 +133,6 @@ WfMenuItem::WfMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppInfo> app
}));
m_menu->append_item(menu_item);
actions->add_action(action_obj);

extra_actions_button.show();
}

extra_actions_button.set_menu_model(m_menu);
Expand All @@ -139,6 +146,7 @@ WfMenuItem::WfMenuItem(WayfireMenu *_menu, Glib::RefPtr<Gio::DesktopAppInfo> app
tooltip->set_text(app->get_name());
return true;
}, false));
set_child(overlay);
}

WfMenuItem::~WfMenuItem()
Expand Down
11 changes: 9 additions & 2 deletions src/panel/widgets/menu/item.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#pragma once
#include <gtkmm/overlay.h>
#include <giomm/desktopappinfo.h>
#include <giomm/menu.h>
#include <giomm/simpleactiongroup.h>
Expand All @@ -9,6 +10,8 @@
#include <gtkmm/image.h>
#include <gtkmm/label.h>

#include "wf-option-wrap.hpp"

class WayfireMenu;
using AppInfo = Glib::RefPtr<Gio::DesktopAppInfo>;

Expand All @@ -31,14 +34,18 @@ class WfMenuItem : public Gtk::FlowBoxChild
}

private:
WfOption<bool> menu_list{"panel/menu_list"};
WfOption<std::string> panel_position{"panel/position"};


WayfireMenu *menu;
Gtk::Box box, list_item;
Gtk::Box box;
Gtk::Image image;
Gtk::Label label;
Glib::RefPtr<Gio::Menu> m_menu;
Glib::RefPtr<Gio::SimpleActionGroup> actions;
Gtk::Button button;
Gtk::MenuButton extra_actions_button;
Gtk::Overlay overlay;
std::vector<sigc::connection> signals;

bool has_actions = false;
Expand Down