Skip to content

use boxflow in tray and launchers to allow multi rows/columns setup #482

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
rpaciorek wants to merge 2 commits into
base: master
Choose a base branch
from
Open

use boxflow in tray and launchers to allow multi rows/columns setup #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47ba7fb
use boxflow in tray and launchers
rpaciorek Jun 9, 2026
1018a5e
fixed typo
rpaciorek Jun 9, 2026
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
10 changes: 10 additions & 0 deletions metadata/panel.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,11 @@ If full_span is off, both sides of the panel will take the same amount of space,
<default>0</default>
<min>0</min>
</option>
<option name="launchers_rows_cols" type="int">
<_short>Number of rows (in horizontal panels) or columns (in vertical panels) in Launchers widget</_short>
<default>1</default>
<min>1</min>
</option>
<option name="launchers" type="dynamic-list" type-hint="dict">
<_short>Launchers</_short>
<_long>Launchers</_long>
Expand Down Expand Up @@ -560,6 +565,11 @@ If full_span is off, both sides of the panel will take the same amount of space,
<default>5</default>
<min>0</min>
</option>
<option name="tray_rows_cols" type="int">
<_short>Number of rows (in horizontal panels) or columns (in vertical panels) in tray widget</_short>
<default>1</default>
<min>1</min>
</option>
<option name="tray_menu_on_middle_click" type="bool">
<_short>Middle Button Activates Menu</_short>
<_long>Mouse right button activates a tray item's secondary action instead of the item's menu.</_long>
Expand Down
10 changes: 7 additions & 3 deletions src/panel/widgets/launchers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,16 +171,20 @@ void WayfireLaunchers::init(Gtk::Box *container)

void WayfireLaunchers::update_layout()
{
box.set_spacing(spacing);
box.set_column_spacing(spacing);
box.set_row_spacing(spacing);
box.set_max_children_per_line(rows_cols);
box.set_min_children_per_line(rows_cols);
box.set_selection_mode(Gtk::SelectionMode::NONE);

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

if (panel_position.value() == PANEL_POSITION_LEFT or panel_position.value() == PANEL_POSITION_RIGHT)
{
box.set_orientation(Gtk::Orientation::VERTICAL);
box.set_orientation(Gtk::Orientation::HORIZONTAL);
} else
{
box.set_orientation(Gtk::Orientation::HORIZONTAL);
box.set_orientation(Gtk::Orientation::VERTICAL);
}
}

Expand Down
5 changes: 3 additions & 2 deletions src/panel/widgets/launchers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <vector>
#include <giomm/desktopappinfo.h>
#include <gtkmm/image.h>
#include <gtkmm/box.h>
#include <gtkmm/flowbox.h>
#include <gtkmm/button.h>
#include <wayfire/util/duration.hpp>

Expand All @@ -27,11 +27,12 @@ struct WfLauncherButton
using launcher_container = std::vector<std::unique_ptr<WfLauncherButton>>;
class WayfireLaunchers : public WayfireWidget
{
Gtk::Box box;
Gtk::FlowBox box;
launcher_container launchers;
launcher_container get_launchers_from_config();

WfOption<int> spacing{"panel/launchers_spacing"};
WfOption<int> rows_cols{"panel/launchers_rows_cols"};

public:
virtual void init(Gtk::Box *container);
Expand Down
1 change: 1 addition & 0 deletions src/panel/widgets/tray/item.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ void StatusNotifierItem::init_widget()
setup_tooltip();
init_menu();
icon.add_css_class("widget-icon");
icon.add_css_class("tray-button");
add_css_class("tray-button");

auto scroll_gesture = Gtk::EventControllerScroll::create();
Expand Down
10 changes: 7 additions & 3 deletions src/panel/widgets/tray/tray.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,20 @@ void WayfireStatusNotifier::remove_item(const Glib::ustring & service)

void WayfireStatusNotifier::update_layout()
{
icons_box.set_spacing(spacing);
icons_box.set_column_spacing(spacing);
icons_box.set_row_spacing(spacing);
icons_box.set_max_children_per_line(rows_cols);
icons_box.set_min_children_per_line(rows_cols);
icons_box.set_selection_mode(Gtk::SelectionMode::NONE);

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

if ((panel_position.value() == PANEL_POSITION_LEFT) || (panel_position.value() == PANEL_POSITION_RIGHT))
{
icons_box.set_orientation(Gtk::Orientation::VERTICAL);
icons_box.set_orientation(Gtk::Orientation::HORIZONTAL);
} else
{
icons_box.set_orientation(Gtk::Orientation::HORIZONTAL);
icons_box.set_orientation(Gtk::Orientation::VERTICAL);
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/panel/widgets/tray/tray.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ class WayfireStatusNotifier : public WayfireWidget
private:
StatusNotifierHost host = StatusNotifierHost(this);

Gtk::Box icons_box;
Gtk::FlowBox icons_box;
std::map<Glib::ustring, StatusNotifierItem> items;

WfOption<int> spacing{"panel/tray_spacing"};
WfOption<int> rows_cols{"panel/tray_rows_cols"};

void update_layout();
void handle_config_reload();
Expand Down