Merge pull request #2030 from Consolatis/wip/cosmic_workspaces

Initial implementation of cosmic-workspace-unstable-v1
This commit is contained in:
Johan Malm 2024-10-01 21:31:04 +01:00 committed by GitHub
commit d18e67eea8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
22 changed files with 1578 additions and 38 deletions

View file

@ -137,7 +137,7 @@ matches_criteria(struct view *view, enum lab_view_criteria criteria)
* special in that they live in a different tree.
*/
struct server *server = view->server;
if (view->scene_tree->node.parent != server->workspace_current->tree
if (view->scene_tree->node.parent != server->workspaces.current->tree
&& !view_is_always_on_top(view)) {
return false;
}
@ -1451,7 +1451,7 @@ view_toggle_always_on_top(struct view *view)
{
assert(view);
if (view_is_always_on_top(view)) {
view->workspace = view->server->workspace_current;
view->workspace = view->server->workspaces.current;
wlr_scene_node_reparent(&view->scene_tree->node,
view->workspace->tree);
} else {
@ -1473,7 +1473,7 @@ view_toggle_always_on_bottom(struct view *view)
{
assert(view);
if (view_is_always_on_bottom(view)) {
view->workspace = view->server->workspace_current;
view->workspace = view->server->workspaces.current;
wlr_scene_node_reparent(&view->scene_tree->node,
view->workspace->tree);
} else {