Refactor view_move_resize()

diff --git a/include/labwc.h b/include/labwc.h
index 461215077c91d14ec24a642a30625fe72d089834..0c9993c76de967f41a9c6147e95248da6d07e5a3 100644 (file)
--- a/include/labwc.h
+++ b/include/labwc.h
@@ -222,7 +222,7 @@ void xwayland_unmanaged_create(struct server *server,
  */
 struct wlr_box view_get_surface_geometry(struct view *view);
 struct wlr_box view_geometry(struct view *view);
-void view_resize(struct view *view, struct wlr_box geo);
+void view_move_resize(struct view *view, struct wlr_box geo);
 void view_minimize(struct view *view);
 void view_unminimize(struct view *view);
 void view_for_each_surface(struct view *view,

diff --git a/src/cursor.c b/src/cursor.c
index 4890c9cef259e880905635234ff76c8ca9cb2e28..5ad5e7cbb8203ef7f353f2e35e887c8650ca4087 100644 (file)
--- a/src/cursor.c
+++ b/src/cursor.c
@@ -116,14 +116,9 @@ process_cursor_resize(struct server *server, uint32_t time)
                return;
        }
 
-       /* Move */
-       view->x = new_view_geo.x;
-       view->y = new_view_geo.y;
-
-       /* Resize */
        new_view_geo.width -= 2 * view->xdg_grab_offset;
        new_view_geo.height -= 2 * view->xdg_grab_offset;
-       view_resize(view, new_view_geo);
+       view_move_resize(view, new_view_geo);
 }
 
 static void

diff --git a/src/view.c b/src/view.c
index a21e24075992b062d93d8c4b010b020794d8fb70..e3d6991abb101d64170274d6325c81d0b708e50b 100644 (file)
--- a/src/view.c
+++ b/src/view.c
@@ -1,15 +1,9 @@
 #include "labwc.h"
 
 void
-view_resize(struct view *view, struct wlr_box geo)
+view_move_resize(struct view *view, struct wlr_box geo)
 {
-       struct wlr_box box = {
-               .x = view->x,
-               .y = view->y,
-               .width = geo.width,
-               .height = geo.height,
-       };
-       view->impl->configure(view, box);
+       view->impl->configure(view, geo);
 }
 
 void

diff --git a/src/xdg.c b/src/xdg.c
index b887d0c23a664ca1566761308aad1e6e7df29aea..81a296d1b114e426562afda5c72bcb8b837a07b2 100644 (file)
--- a/src/xdg.c
+++ b/src/xdg.c
@@ -133,6 +133,8 @@ handle_request_resize(struct wl_listener *listener, void *data)
 static void
 xdg_toplevel_view_configure(struct view *view, struct wlr_box geo)
 {
+       view->x = geo.x;
+       view->y = geo.y;
        wlr_xdg_toplevel_set_size(view->xdg_surface, (uint32_t)geo.width,
                                  (uint32_t)geo.height);
 }

diff --git a/src/xwayland.c b/src/xwayland.c
index 9a6e1be55ffde40907878a43fdfb4f730dd6e2ec..5bab41754491318b225c5bf2372db5bbb7e65173 100644 (file)
--- a/src/xwayland.c
+++ b/src/xwayland.c
@@ -50,6 +50,8 @@ handle_request_configure(struct wl_listener *listener, void *data)
 static void
 configure(struct view *view, struct wlr_box geo)
 {
+       view->x = geo.x;
+       view->y = geo.y;
        wlr_xwayland_surface_configure(view->xwayland_surface, (int16_t)geo.x,
                                       (int16_t)geo.y, (uint16_t)geo.width,
                                       (uint16_t)geo.height);