CWindow Position arithmetic

Author: morganchristiansson

CIO/CWindow.cpp

@@ -63,10 +63,10 @@ void CWindow::setMouseData(SDL_MouseMotionEvent motion)
 {
     // cursor is on the title frame (+/-2 and +/-4 are only for a good optic)
     const Position titleFrameLT =
-      pos_ + Position(global::getBitmapSize(ArchiveID::Resource, WINDOW_LEFT_UPPER_CORNER).x + 2, 4);
-    const Position titleFrameRB = Position(
-      pos_.x + static_cast<int>(size_.x) - global::getBitmapSize(ArchiveID::Resource, WINDOW_RIGHT_UPPER_CORNER).x - 2,
-      pos_.y + global::getBitmapSize(ArchiveID::Resource, WINDOW_UPPER_FRAME).y - 4);
+      pos_ + Position(global::getBitmapSize(ArchiveID::Resource, WINDOW_LEFT_UPPER_CORNER).x, 0) + Position(2, 4);
+    const Position titleFrameRB =
+      pos_ + Position(static_cast<int>(size_.x), global::getBitmapSize(ArchiveID::Resource, WINDOW_UPPER_FRAME).y)
+      - Position(global::getBitmapSize(ArchiveID::Resource, WINDOW_RIGHT_UPPER_CORNER).x + 2, 4);
     if(IsPointInRect(motion.x, motion.y, Rect(titleFrameLT, Extent(titleFrameRB - titleFrameLT))))
     {
         // left button was pressed while moving
@@ -90,32 +90,29 @@ void CWindow::setMouseData(SDL_MouseMotionEvent motion)
     if(canClose)
     {
         // cursor is on the button (+/-2 is only for the optic)
-        canClose_marked =
-          (motion.x >= pos_.x + 2)
-          && (motion.x < pos_.x + global::getBitmapSize(ArchiveID::Resource, WINDOW_BUTTON_CLOSE).x - 2)
-          && (motion.y >= pos_.y + 2)
-          && (motion.y < pos_.y + global::getBitmapSize(ArchiveID::Resource, WINDOW_BUTTON_CLOSE).y - 2);
+        const auto closeSize = global::getBitmapSize(ArchiveID::Resource, WINDOW_BUTTON_CLOSE);
+        canClose_marked = IsPointInRect(Position(motion.x, motion.y),
+                                        Rect(pos_ + Position(2, 2), Extent(closeSize - Extent(4, 4))));
     }
     // check whats happen to the minimize button
     if(canMinimize)
     {
         // cursor is on the button (+/-2 is only for the optic)
-        canMinimize_marked =
-          (motion.x >= pos_.x + static_cast<int>(size_.x)
-                         - global::getBitmapSize(ArchiveID::Resource, WINDOW_BUTTON_MINIMIZE).x + 2)
-          && (motion.x < pos_.x + static_cast<int>(size_.x) - 2) && (motion.y >= pos_.y + 2)
-          && (motion.y < pos_.y + global::getBitmapSize(ArchiveID::Resource, WINDOW_BUTTON_MINIMIZE).y - 2);
+        const auto minSize = global::getBitmapSize(ArchiveID::Resource, WINDOW_BUTTON_MINIMIZE);
+        canMinimize_marked = IsPointInRect(
+          Position(motion.x, motion.y),
+          Rect(pos_ + Position(static_cast<int>(size_.x) - minSize.x + 2, 2), Extent(minSize - Extent(4, 4))));
     }
     // check whats happen to the resize button
     if(canResize)
     {
         // cursor is on the button (+/-2 is only for the optic)
-        if((motion.x >= pos_.x + static_cast<int>(size_.x)
-                          - global::getBitmapSize(ArchiveID::Resource, WINDOW_BUTTON_RESIZE).x + 2)
-           && (motion.x < pos_.x + static_cast<int>(size_.x) - 2)
-           && (motion.y >= pos_.y + static_cast<int>(size_.y)
-                             - global::getBitmapSize(ArchiveID::Resource, WINDOW_BUTTON_RESIZE).y + 2)
-           && (motion.y < pos_.y + static_cast<int>(size_.y) - 2))
+        const auto resizeSize = global::getBitmapSize(ArchiveID::Resource, WINDOW_BUTTON_RESIZE);
+        if(IsPointInRect(
+             Position(motion.x, motion.y),
+             Rect(pos_ + Position(static_cast<int>(size_.x) - resizeSize.x + 2,
+                                  static_cast<int>(size_.y) - resizeSize.y + 2),
+                  Extent(resizeSize - Extent(4, 4)))))
         {
             // left button was pressed while moving
             if(SDL_GetMouseState(nullptr, nullptr) & SDL_BUTTON(SDL_BUTTON_LEFT))
@@ -321,15 +318,14 @@ void CWindow::draw(Position /*parentOrigin*/)
     {
         getTexture(ArchiveID::Resource, WINDOW_LEFT_UPPER_CORNER).draw(pos_);
 
-        const int ruW = getTexture(ArchiveID::Resource, WINDOW_RIGHT_UPPER_CORNER).getSize().x;
+        const Extent ru = getTexture(ArchiveID::Resource, WINDOW_RIGHT_UPPER_CORNER).getSize();
         getTexture(ArchiveID::Resource, WINDOW_RIGHT_UPPER_CORNER)
-          .draw(pos_ + Position(static_cast<int>(size_.x) - ruW, 0));
+          .draw(pos_ + Position(static_cast<int>(size_.x) - ru.x, 0));
 
-        const int crW = getTexture(ArchiveID::Resource, WINDOW_CORNER_RECTANGLE).getSize().x;
-        const int crH = getTexture(ArchiveID::Resource, WINDOW_CORNER_RECTANGLE).getSize().y;
+        const Extent cr = getTexture(ArchiveID::Resource, WINDOW_CORNER_RECTANGLE).getSize();
         getTexture(ArchiveID::Resource, WINDOW_CORNER_RECTANGLE)
-          .draw(pos_ + Position(0, static_cast<int>(size_.y) - crH));
-        getTexture(ArchiveID::Resource, WINDOW_CORNER_RECTANGLE).draw(pos_ + size_ - Position(crW, crH));
+          .draw(pos_ + Position(0, static_cast<int>(size_.y) - cr.y));
+        getTexture(ArchiveID::Resource, WINDOW_CORNER_RECTANGLE).draw(pos_ + size_ - cr);
     }
 
     // 9. Close button
@@ -355,9 +351,9 @@ void CWindow::draw(Position /*parentOrigin*/)
             minimizebutton = WINDOW_BUTTON_MINIMIZE_MARKED;
         else
             minimizebutton = WINDOW_BUTTON_MINIMIZE;
+        const Extent minBtnSize = getTexture(ArchiveID::Resource, minimizebutton).getSize();
         getTexture(ArchiveID::Resource, minimizebutton)
-          .draw(pos_
-                + Position(static_cast<int>(size_.x) - getTexture(ArchiveID::Resource, minimizebutton).getSize().x, 0));
+          .draw(pos_ + Position(static_cast<int>(size_.x) - minBtnSize.x, 0));
     }
 
     // 11. Resize button
@@ -370,8 +366,8 @@ void CWindow::draw(Position /*parentOrigin*/)
             resizebutton = WINDOW_BUTTON_RESIZE_MARKED;
         else
             resizebutton = WINDOW_BUTTON_RESIZE;
-        getTexture(ArchiveID::Resource, resizebutton)
-          .draw(pos_ + size_ - getTexture(ArchiveID::Resource, resizebutton).getSize());
+        const Extent resBtnSize = getTexture(ArchiveID::Resource, resizebutton).getSize();
+        getTexture(ArchiveID::Resource, resizebutton).draw(pos_ + size_ - resBtnSize);
     }
 }