clang-format

Author: morganchristiansson

CIO/CButton.cpp

@@ -140,7 +140,8 @@ void CButton::draw(Position parentOrigin) const
     } else if(button_text)
     {
         // Draw text centered (using native-size texture drawing for each character)
-        const Extent textSize(CFont::getTextWidth(button_text, FontSize::Medium), static_cast<unsigned>(FontSize::Medium));
+        const Extent textSize(CFont::getTextWidth(button_text, FontSize::Medium),
+                              static_cast<unsigned>(FontSize::Medium));
         const Position textPos = absPos + (Position(size_) - textSize) / 2;
         CFont::draw(button_text, textPos, FontSize::Medium, button_text_color, FontAlign::Left);
     }

CIO/CButton.h

@@ -33,8 +33,8 @@ class CButton
     // Access
     int getX() const { return pos_.x; };
     int getY() const { return pos_.y; };
-    const Position& getPos() const { return pos_; }
-    const Extent& getSize() const { return size_; };
+    Position getPos() const { return pos_; }
+    Extent getSize() const { return size_; };
     void setX(int x) { pos_.x = x; };
     void setY(int y) { pos_.y = y; };
     void setButtonPicture(int picture);

CIO/CControlContainer.h

@@ -62,7 +62,7 @@ class CControlContainer
     CControlContainer(int pic_background, BorderSizes border);
     virtual ~CControlContainer() noexcept;
     // Access
-    const BorderSizes& getBorderSizes() const { return border; }
+    BorderSizes getBorderSizes() const { return border; }
     Extent getBorderSize() const
     {
         return {static_cast<unsigned>(border.left + border.right), static_cast<unsigned>(border.top + border.bottom)};

CIO/CMinimapWindow.cpp

@@ -17,19 +17,17 @@ void CMinimapWindow::draw(Position /*parentOrigin*/)
     // Compute content area (inside the frames)
     const auto& b = getBorderSizes();
     const Position contentPos = pos_ + Position(b.left, b.top);
-    const int cw = static_cast<int>(size_.x) - b.left - b.right;
-    const int ch = static_cast<int>(size_.y) - b.top - b.bottom;
-    if(cw <= 0 || ch <= 0)
+    const auto contentSize = getSize() - getBorderSize();
+    if(static_cast<int>(contentSize.x) <= 0 || static_cast<int>(contentSize.y) <= 0)
         return;
-    const Extent contentSize(cw, ch);
 
     auto* map = global::s2->getMapObj();
     if(!map)
         return;
 
     // Fill pixel buffer with minimap terrain
     int scale = 1;
-    map->drawMinimap(pixels_, cw, ch, scale);
+    map->drawMinimap(pixels_, static_cast<int>(contentSize.x), static_cast<int>(contentSize.y), scale);
 
     // Upload to texture and draw
     if(!minimapTex_.isValid() || minimapTex_.getSize() != contentSize)
@@ -59,8 +57,10 @@ void CMinimapWindow::draw(Position /*parentOrigin*/)
     {
         const int arrowIdx = MAPPIC_ARROWCROSS_ORANGE;
         const auto& dispRect = map->getDisplayRect();
-        const Position arrowCenter = dispRect.getOrigin() + Position(dispRect.getSize().x / 2, dispRect.getSize().y / 2);
-        const Position arrowPos = contentPos + arrowCenter / Position(triangleWidth, triangleHeight) / scale
+        const Position arrowCenter =
+          dispRect.getOrigin() + Position(dispRect.getSize().x / 2, dispRect.getSize().y / 2);
+        const Position arrowPos =
+          contentPos + arrowCenter / Position(triangleWidth, triangleHeight) / scale
           - Position(static_cast<int>(global::bmpArray[arrowIdx].nx), static_cast<int>(global::bmpArray[arrowIdx].ny));
         getBmpTexture(arrowIdx).draw(arrowPos);
     }

CIO/CPicture.h

@@ -28,8 +28,8 @@ class CPicture
     // Access
     int getX() const { return pos_.x; };
     int getY() const { return pos_.y; };
-    const Position& getPos() const { return pos_; }
-    const Extent& getSize() const { return size_; };
+    Position getPos() const { return pos_; }
+    Extent getSize() const { return size_; };
     void setX(int x) { pos_.x = x; };
     void setY(int y) { pos_.y = y; };
     void setMouseData(const SDL_MouseMotionEvent& motion);

CIO/CSelectBox.cpp

@@ -237,5 +237,4 @@ void CSelectBox::draw(Position parentOrigin)
     // Draw scroll buttons (on top, within the select box)
     ScrollUpButton->draw(absPos);
     ScrollDownButton->draw(absPos);
-
 }

CIO/CSelectBox.h

@@ -32,8 +32,8 @@ class CSelectBox
 public:
     CSelectBox(Position pos, Extent size, FontSize fontsize = FontSize::Large, FontColor text_color = FontColor::Yellow,
                int bg_color = -1);
-    const Position& getPos() const { return pos_; }
-    const Extent& getSize() const { return size_; }
+    Position getPos() const { return pos_; }
+    Extent getSize() const { return size_; }
     void setMouseData(SDL_MouseButtonEvent button);
     void setMouseData(SDL_MouseMotionEvent motion);
     void draw(Position parentOrigin);

CIO/CTextfield.cpp

@@ -268,5 +268,4 @@ void CTextfield::draw(Position parentOrigin)
         textObj->setText(displayText);
         textObj->draw(Position(parentOrigin.x + 2, parentOrigin.y + 4));
     }
-
 }

CIO/CTextfield.h

@@ -38,7 +38,7 @@ class CTextfield
     // Access
     Position getPos() const;
     void setPos(Position pos);
-    const Extent& getSize() const { return size_; };
+    Extent getSize() const { return size_; };
     int getCols() const { return cols; }
     int getRows() const { return rows; }
     void setText(const std::string& text);

CIO/CWindow.cpp

@@ -262,12 +262,12 @@ void CWindow::draw(Position /*parentOrigin*/)
         const auto viewH = global::s2->getRes().y;
         const auto& b = getBorderSizes();
         const auto contentOrigin = origin + Position(b.left, b.top);
-        const auto contentW = static_cast<int>(size_.x) - b.left - b.right;
-        const auto contentH = static_cast<int>(size_.y) - b.top - b.bottom;
-        if(contentW > 0 && contentH > 0)
+        const auto contentSize = getSize() - getBorderSize();
+        if(static_cast<int>(contentSize.x) > 0 && static_cast<int>(contentSize.y) > 0)
         {
             glEnable(GL_SCISSOR_TEST);
-            glScissor(contentOrigin.x, viewH - (contentOrigin.y + contentH), contentW, contentH);
+            glScissor(contentOrigin.x, viewH - (contentOrigin.y + static_cast<int>(contentSize.y)),
+                      static_cast<int>(contentSize.x), static_cast<int>(contentSize.y));
             drawChildren(origin);
             glDisable(GL_SCISSOR_TEST);
         }