mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-12 08:21:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

cleaned up

Browse source
This commit is contained in:
nicolas3121 2024-04-16 22:36:48 +02:00
parent ca3f58c1ff
commit 766e506500
1 changed files with 16 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/action.c
View file

@ -756,48 +756,32 @@ actions_run(struct view *activator, struct server *server,
break; break;
case ACTION_TYPE_DIRECTIONAL_TARGET_WINDOW: case ACTION_TYPE_DIRECTIONAL_TARGET_WINDOW:
if (view) { if (view) {
/* Config parsing makes sure that direction is a valid direction */ int dx, dy, distance;
struct wl_array views;
struct view **item;
enum view_edge direction = action_get_int(action, "direction", 0); enum view_edge direction = action_get_int(action, "direction", 0);
int distance, dx, dy; struct view *v;
struct view *closest_view = NULL;
int min_distance = INT_MAX; int min_distance = INT_MAX;
struct view *nearest_view = NULL; for_each_view(v, &server->views,
wl_array_init(&views); LAB_VIEW_CRITERIA_CURRENT_WORKSPACE) {
view_array_append(server, &views, LAB_VIEW_CRITERIA_CURRENT_WORKSPACE); if (v->minimized) {
wl_array_for_each(item, &views) {
if (*item == view) {
continue; continue;
} }
if ((*item)->minimized) { dx = v->current.x - view->current.x;
dy = v->current.y - view->current.y;
distance = dx * dx + dy * dy;
if ((direction == VIEW_EDGE_UP && dy >= 0)
|| (direction == VIEW_EDGE_LEFT && dx >= 0)
|| (direction == VIEW_EDGE_DOWN && dy <= 0)
|| (direction == VIEW_EDGE_RIGHT && dx <= 0)) {
continue; continue;
} }
dx = (*item)->current.x - view->current.x;
dy = (*item)->current.y - view->current.y;
switch (direction) {
case VIEW_EDGE_LEFT:
if (dx >= 0) continue;
break;
case VIEW_EDGE_RIGHT:
if (dx <= 0) continue;
break;
case VIEW_EDGE_DOWN:
if (dy <= 0) continue;
break;
case VIEW_EDGE_UP:
if (dy >= 0) continue;
break;
default:
continue;
}
distance = dx*dx + dy*dy;
if (distance < min_distance) { if (distance < min_distance) {
min_distance = distance; min_distance = distance;
nearest_view = *item; closest_view = v;
} }
} }
if (nearest_view) { if (closest_view) {
desktop_focus_view(nearest_view, /*raise*/ true); desktop_focus_view(closest_view, /*raise*/ true);
} }
} }
break; break;