Skip to content

fix: honor buttons-side preference in the classic titlebar #5

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
p134c0d3 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: honor buttons-side preference in the classic titlebar #5

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
45 changes: 42 additions & 3 deletions src/ui/windowing/toolbar.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,49 @@ namespace Singularity.Widgets {
}

private void apply_button_layout() {
if (has_css_class("ssd-mode")) {
minimize_btn.visible = false;
maximize_btn.visible = false;
close_btn.visible = false;
return;
}

string layout = resolve_button_layout();
minimize_btn.visible = "minimize" in layout;
maximize_btn.visible = "maximize" in layout;
close_btn.visible = "close" in layout;
string[] parts = layout.split(":");
string left_str = parts.length > 0 ? parts[0] : "";
string right_str = parts.length > 1 ? parts[1] : "";

bool close_left = left_str.contains("close");
bool min_left = left_str.contains("minimize");
bool max_left = left_str.contains("maximize");
bool close_right = right_str.contains("close");
bool min_right = right_str.contains("minimize");
bool max_right = right_str.contains("maximize");

bool cluster_on_left = close_left || (!close_right && (min_left || max_left));

detach_control(minimize_btn);
detach_control(maximize_btn);
detach_control(close_btn);

if (cluster_on_left) {
start_box.prepend(minimize_btn);
start_box.prepend(maximize_btn);
start_box.prepend(close_btn);
} else {
end_box.append(minimize_btn);
end_box.append(maximize_btn);
end_box.append(close_btn);
}

minimize_btn.visible = min_left || min_right;
maximize_btn.visible = max_left || max_right;
close_btn.visible = close_left || close_right;
}

private static void detach_control(Widget w) {
var parent = w.get_parent();
if (parent is Box) ((Box) parent).remove(w);
}

// Prefer the host org.gnome.desktop.wm.preferences button-layout (which
Expand Down