From e96e0dc02d9368580100bbabd8f098746a42af6b Mon Sep 17 00:00:00 2001
From: memchr <118117622+memchr@users.noreply.github.com>
Date: Mon, 11 Sep 2023 09:09:34 +0000
Subject: refactor: utilize 'middle()' method for window/montior center (#3253)

---
 src/events/Windows.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/events/Windows.cpp')

diff --git a/src/events/Windows.cpp b/src/events/Windows.cpp
index 9089567a..2d428a8a 100644
--- a/src/events/Windows.cpp
+++ b/src/events/Windows.cpp
@@ -385,7 +385,7 @@ void Events::listener_mapWindow(void* owner, void* data) {
                 if (ARGS[1] == "1")
                     RESERVEDOFFSET = (PMONITOR->vecReservedTopLeft - PMONITOR->vecReservedBottomRight) / 2.f;
 
-                PWINDOW->m_vRealPosition = PMONITOR->vecPosition + PMONITOR->vecSize / 2.f - PWINDOW->m_vRealSize.goalv() / 2.f + RESERVEDOFFSET;
+                PWINDOW->m_vRealPosition = PMONITOR->middle() - PWINDOW->m_vRealSize.goalv() / 2.f + RESERVEDOFFSET;
             }
         }
 
@@ -893,8 +893,7 @@ void Events::listener_activateXDG(wl_listener* listener, void* data) {
         g_pCompositor->moveWindowToTop(PWINDOW);
 
     g_pCompositor->focusWindow(PWINDOW);
-    Vector2D middle = PWINDOW->m_vRealPosition.goalv() + PWINDOW->m_vRealSize.goalv() / 2.f;
-    g_pCompositor->warpCursorTo(middle);
+    g_pCompositor->warpCursorTo(PWINDOW->middle());
 }
 
 void Events::listener_activateX11(void* owner, void* data) {
@@ -928,8 +927,7 @@ void Events::listener_activateX11(void* owner, void* data) {
         g_pCompositor->moveWindowToTop(PWINDOW);
 
     g_pCompositor->focusWindow(PWINDOW);
-    Vector2D middle = PWINDOW->m_vRealPosition.goalv() + PWINDOW->m_vRealSize.goalv() / 2.f;
-    g_pCompositor->warpCursorTo(middle);
+    g_pCompositor->warpCursorTo(PWINDOW->middle());
 }
 
 void Events::listener_configureX11(void* owner, void* data) {
-- 
cgit v1.2.3