mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-02 07:15:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

view: Rename/move workspaces_send_to() to view_move_to_workspace()

Browse source 
This function semantically belongs in view.c since it
modifies `struct view`.

Also a minor formatting fix in view_toggle_always_on_top().
This commit is contained in:
John Lindgren 2022-11-21 13:03:49 -05:00 • committed by Consolatis
parent 0e6d99e0ca
commit c67c6691ac
5 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/view.h
View file

@ -133,6 +133,7 @@ void view_set_fullscreen(struct view *view, bool fullscreen,
void view_toggle_maximize(struct view *view); void view_toggle_maximize(struct view *view);
void view_toggle_decorations(struct view *view); void view_toggle_decorations(struct view *view);
void view_toggle_always_on_top(struct view *view); void view_toggle_always_on_top(struct view *view);
void view_move_to_workspace(struct view *view, struct workspace *workspace);
void view_set_decorations(struct view *view, bool decorations); void view_set_decorations(struct view *view, bool decorations);
void view_toggle_fullscreen(struct view *view); void view_toggle_fullscreen(struct view *view);
void view_adjust_for_layout_change(struct view *view); void view_adjust_for_layout_change(struct view *view);

1
include/workspaces.h
View file

@ -21,7 +21,6 @@ struct workspace {
void workspaces_init(struct server *server); void workspaces_init(struct server *server);
void workspaces_switch_to(struct workspace *target); void workspaces_switch_to(struct workspace *target);
void workspaces_send_to(struct view *view, struct workspace *target);
void workspaces_destroy(struct server *server); void workspaces_destroy(struct server *server);
void workspaces_osd_hide(struct seat *seat); void workspaces_osd_hide(struct seat *seat);
struct workspace *workspaces_find(struct workspace *anchor, const char *name); struct workspace *workspaces_find(struct workspace *anchor, const char *name);

2
src/action.c
View file

@ -353,7 +353,7 @@ actions_run(struct view *activator, struct server *server,
char *target_name = action_str_from_arg(arg); char *target_name = action_str_from_arg(arg);
target = workspaces_find(view->workspace, target_name); target = workspaces_find(view->workspace, target_name);
if (target) { if (target) {
workspaces_send_to(view, target); view_move_to_workspace(view, target);
} }
} }
break; break;

15
src/view.c
View file

@ -522,13 +522,26 @@ view_toggle_always_on_top(struct view *view)
assert(view); assert(view);
if (is_always_on_top(view)) { if (is_always_on_top(view)) {
view->workspace = view->server->workspace_current; view->workspace = view->server->workspace_current;
wlr_scene_node_reparent(&view->scene_tree->node, view->workspace->tree); wlr_scene_node_reparent(&view->scene_tree->node,
view->workspace->tree);
} else { } else {
wlr_scene_node_reparent(&view->scene_tree->node, wlr_scene_node_reparent(&view->scene_tree->node,
view->server->view_tree_always_on_top); view->server->view_tree_always_on_top);
} }
} }
void
view_move_to_workspace(struct view *view, struct workspace *workspace)
{
assert(view);
assert(workspace);
if (view->workspace != workspace) {
view->workspace = workspace;
wlr_scene_node_reparent(&view->scene_tree->node,
workspace->tree);
}
}
void void
view_set_decorations(struct view *view, bool decorations) view_set_decorations(struct view *view, bool decorations)
{ {

12
src/workspaces.c
View file

@ -270,18 +270,6 @@ workspaces_switch_to(struct workspace *target)
_osd_show(target->server); _osd_show(target->server);
} }
void
workspaces_send_to(struct view *view, struct workspace *target)
{
assert(view);
assert(target);
if (view->workspace == target) {
return;
}
wlr_scene_node_reparent(&view->scene_tree->node, target->tree);
view->workspace = target;
}
void void
workspaces_osd_hide(struct seat *seat) workspaces_osd_hide(struct seat *seat)
{ {