hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-23 05:15:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Better UX when moving/resizing/rotating maximized views

Browse source
This commit is contained in:
emersion 2017-11-08 22:25:06 +01:00
parent 03d3fdc158
commit 4df8be1a8f
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
1 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
rootston/cursor.c
View file

@ -39,13 +39,18 @@ static void cursor_set_xcursor_image(struct roots_input *input,
void view_begin_move(struct roots_input *input, struct wlr_cursor *cursor, void view_begin_move(struct roots_input *input, struct wlr_cursor *cursor,
struct roots_view *view) { struct roots_view *view) {
view_maximize(view, false);
input->mode = ROOTS_CURSOR_MOVE; input->mode = ROOTS_CURSOR_MOVE;
input->offs_x = cursor->x; input->offs_x = cursor->x;
input->offs_y = cursor->y; input->offs_y = cursor->y;
input->view_x = view->x; if (view->maximized) {
input->view_y = view->y; input->view_x = view->saved.x;
input->view_y = view->saved.y;
} else {
input->view_x = view->x;
input->view_y = view->y;
}
view_maximize(view, false);
wlr_seat_pointer_clear_focus(input->wl_seat); wlr_seat_pointer_clear_focus(input->wl_seat);
struct wlr_xcursor *xcursor = get_move_xcursor(input->xcursor_theme); struct wlr_xcursor *xcursor = get_move_xcursor(input->xcursor_theme);
@ -56,18 +61,25 @@ void view_begin_move(struct roots_input *input, struct wlr_cursor *cursor,
void view_begin_resize(struct roots_input *input, struct wlr_cursor *cursor, void view_begin_resize(struct roots_input *input, struct wlr_cursor *cursor,
struct roots_view *view, uint32_t edges) { struct roots_view *view, uint32_t edges) {
view_maximize(view, false);
input->mode = ROOTS_CURSOR_RESIZE; input->mode = ROOTS_CURSOR_RESIZE;
input->offs_x = cursor->x; input->offs_x = cursor->x;
input->offs_y = cursor->y; input->offs_y = cursor->y;
input->view_x = view->x; if (view->maximized) {
input->view_y = view->y; input->view_x = view->saved.x;
struct wlr_box size; input->view_y = view->saved.y;
view_get_size(view, &size); input->view_width = view->saved.width;
input->view_width = size.width; input->view_height = view->saved.height;
input->view_height = size.height; } else {
input->view_x = view->x;
input->view_y = view->y;
struct wlr_box size;
view_get_size(view, &size);
input->view_width = size.width;
input->view_height = size.height;
}
input->resize_edges = edges; input->resize_edges = edges;
view_maximize(view, false);
wlr_seat_pointer_clear_focus(input->wl_seat); wlr_seat_pointer_clear_focus(input->wl_seat);
struct wlr_xcursor *xcursor = get_resize_xcursor(input->xcursor_theme, edges); struct wlr_xcursor *xcursor = get_resize_xcursor(input->xcursor_theme, edges);
@ -78,12 +90,12 @@ void view_begin_resize(struct roots_input *input, struct wlr_cursor *cursor,
void view_begin_rotate(struct roots_input *input, struct wlr_cursor *cursor, void view_begin_rotate(struct roots_input *input, struct wlr_cursor *cursor,
struct roots_view *view) { struct roots_view *view) {
view_maximize(view, false);
input->mode = ROOTS_CURSOR_ROTATE; input->mode = ROOTS_CURSOR_ROTATE;
input->offs_x = cursor->x; input->offs_x = cursor->x;
input->offs_y = cursor->y; input->offs_y = cursor->y;
input->view_rotation = view->rotation; input->view_rotation = view->rotation;
view_maximize(view, false);
wlr_seat_pointer_clear_focus(input->wl_seat); wlr_seat_pointer_clear_focus(input->wl_seat);
struct wlr_xcursor *xcursor = get_rotate_xcursor(input->xcursor_theme); struct wlr_xcursor *xcursor = get_rotate_xcursor(input->xcursor_theme);