Skip to content
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

Jump to bottom

Update workspaces.cpp #2507

Merged
merged 1 commit into from Sep 13, 2023
Merged

Update workspaces.cpp #2507

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/modules/hyprland/workspaces.cpp
View file
Open in desktop
Expand Up @@ -439,7 +439,6 @@ void Workspaces::sort_workspaces() {
// Helper comparisons
auto is_id_less = a->id() < b->id();
auto is_name_less = a->name() < b->name();
auto is_number_less = std::stoi(a->name()) < std::stoi(b->name());

switch (sort_by_) {
case SORT_METHOD::ID:
Expand All @@ -448,7 +447,7 @@ void Workspaces::sort_workspaces() {
return is_name_less;
case SORT_METHOD::NUMBER:
try {
return is_number_less;
return std::stoi(a->name()) < std::stoi(b->name());
Copy link
Contributor

@zjeffer zjeffer Sep 13, 2023 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this can be improved more by changing the 3 helper comparisons to be lambdas instead of boolean variables.

Like this:

auto is_id_less = [a, b]() { a->id() < b->id(); };
...

We can then easilly use:

return is_number_less() (with the brackets, because it's a function)

and the try catch would still work without having to put the entire comparison method inside the switch statement.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure. I'm a bit rusty on c++ so i'm quite slow, but i want to make a PR to the Hyprland project enabling persistent workspaces from the compositor itself (if somebody don't beat me to it, it's all very active!), so i'll probably also take a better look at this part of waybar if there is space for improvement.
That fix I made was done in a real rush!

} catch (const std::invalid_argument &) {
// Handle the exception if necessary.
break;
Expand Down