Skip to content

panel : remove special-casing of window-list #597

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

Draft
AKArien wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

panel : remove special-casing of window-list #597

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df64db0
panel : remove special-casing of window-list
AKArien Nov 12, 2026
57ac7e1
panel : fix up alignements and expands for consistent layouts
AKArien Nov 12, 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
65 changes: 14 additions & 51 deletions src/panel/panel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,55 +96,52 @@ class WayfirePanel::impl
auto orientation = is_horizontal ? Gtk::Orientation::HORIZONTAL : Gtk::Orientation::VERTICAL;
set_boxes_orientation(orientation);

if (center)
if (is_horizontal)
{
left_box.set_valign(Gtk::Align::FILL);
right_box.set_valign(Gtk::Align::FILL);
center_box.set_valign(Gtk::Align::FILL);
center_box.set_halign(Gtk::Align::CENTER);
} else
{
left_box.set_expand(true);
right_box.set_expand(true);
left_box.set_halign(Gtk::Align::FILL);
right_box.set_halign(Gtk::Align::FILL);
center_box.set_halign(Gtk::Align::FILL);
center_box.set_valign(Gtk::Align::CENTER);
}

if (center)
{
int lmin, lnat, lminb, lnatb, rmin, rnat, rminb, rnatb, mmin, mnat, mminb, mnatb;
left_box.measure(orientation, -1, lmin, lnat, lminb, lnatb);
right_box.measure(orientation, -1, rmin, rnat, rminb, rnatb);
center_box.measure(orientation, -1, mmin, mnat, mminb, mnatb);

center_box.set_halign(Gtk::Align::CENTER);
center_box.set_valign(Gtk::Align::CENTER);

if (is_horizontal)
{
content_box.set_size_request((std::max(lnat, rnat) * 2) + mnat, -1);

left_box.set_halign(Gtk::Align::END);
right_box.set_halign(Gtk::Align::START);
left_box.set_valign(Gtk::Align::FILL);
right_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::FILL);
right_box.set_halign(Gtk::Align::FILL);
left_box.set_valign(Gtk::Align::END);
right_box.set_valign(Gtk::Align::START);
}
} else
{
left_box.set_expand(false);
right_box.set_expand(false);

content_box.set_size_request(-1, -1);

if (is_horizontal)
{
left_box.set_halign(Gtk::Align::START);
right_box.set_halign(Gtk::Align::END);
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::FILL);
right_box.set_halign(Gtk::Align::FILL);
}
}
}
Expand Down Expand Up @@ -175,9 +172,6 @@ class WayfirePanel::impl

content_box.set_end_widget(right_box);

content_box.set_hexpand(true);
content_box.set_vexpand(true);

window->set_child(content_box);
}

Expand Down Expand Up @@ -358,16 +352,6 @@ class WayfirePanel::impl
auto widgets = tokenize(list);
for (auto widget_name : widgets)
{
if (widget_name == "window-list")
{
bool vertical =
(panel_position.value() == PANEL_POSITION_LEFT) ||
(panel_position.value() == PANEL_POSITION_RIGHT);

box.set_hexpand(!vertical);
box.set_vexpand(vertical);
}

auto widget = widget_from_name(widget_name);
if (!widget)
{
Expand All @@ -381,26 +365,6 @@ class WayfirePanel::impl
}
}

void update_window_list_expand()
{
auto has_window_list = [this] (const std::string& list)
{
for (const auto& widget : tokenize(list))
{
if (widget == "window-list")
{
return true;
}
}

return false;
};

left_box.set_hexpand(has_window_list(left_widgets_opt.value()));
right_box.set_hexpand(has_window_list(right_widgets_opt.value()));
center_box.set_hexpand(has_window_list(center_widgets_opt.value()));
}

WfOption<std::string> left_widgets_opt{"panel/widgets_left"};
WfOption<std::string> right_widgets_opt{"panel/widgets_right"};
WfOption<std::string> center_widgets_opt{"panel/widgets_center"};
Expand All @@ -424,7 +388,6 @@ class WayfirePanel::impl
void handle_config_reload()
{
update_orientation();
update_window_list_expand();

for (auto& w : left_widgets)
{
Expand Down
Loading