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.

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

hyprland/workspaces: Improve the workspaces persistency logic #2967

Merged
merged 2 commits into from
Feb 27, 2024

Conversation

aruhier
Copy link
Contributor

@aruhier aruhier commented Feb 24, 2024

Fixes #2945

Split the config and rule persistency in 2 attributes, one storing the persistency as set in Waybar's config, the other one storing the persistency as set in Hyprland.

It fixes some conflicts between the persistency state of a workspace as set in Waybar's config and its dynamic state in Hyprland.

It allows to remove a persistent workspace in Waybar if this workspace is removed from Hyprland and if the workspace is not set as persistent in Waybar's config.

@aruhier aruhier force-pushed the pr_hyprland_workspaces branch from bf4f08e to 8c7e321 Compare February 24, 2024 23:06
@aruhier
Copy link
Contributor Author

aruhier commented Feb 24, 2024

CC @zjeffer

Copy link
Contributor

@zjeffer zjeffer left a comment

Choose a reason for hiding this comment

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

Works really well! Thanks!

Copy link
Contributor

@zjeffer zjeffer left a comment

Choose a reason for hiding this comment

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

Some nitpicking ;)

include/modules/hyprland/workspaces.hpp Show resolved Hide resolved
include/modules/hyprland/workspaces.hpp Outdated Show resolved Hide resolved
Fixes Alexays#2945

Split the config and rule persistency in 2 attributes, one storing the
persistency as set in Waybar's config, the other one storing the
persistency as set in Hyprland.

It fixes some conflicts between the persistency state of a workspace as
set in Waybar's config and its dynamic state in Hyprland.

It allows to remove a persistent workspace in Waybar if this workspace
is removed from Hyprland and if the workspace is not set as persistent
in Waybar's config.
@aruhier aruhier force-pushed the pr_hyprland_workspaces branch from 01b2920 to 3abf4a8 Compare February 25, 2024 23:14
@aruhier
Copy link
Contributor Author

aruhier commented Feb 25, 2024

Thanks for the review!

Co-authored-by: Tuur Vanhoutte <4633209+zjeffer@users.noreply.github.com>
@aruhier aruhier force-pushed the pr_hyprland_workspaces branch from 3abf4a8 to d6d4d87 Compare February 25, 2024 23:21
@Alexays
Copy link
Owner

Alexays commented Feb 27, 2024

LGTM, thanks guys!

@Alexays Alexays merged commit e79ea93 into Alexays:master Feb 27, 2024
7 of 9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

hyprland/workspaces: Persistent workspace disappear after being active
3 participants