Fixing CI issues

Author: Noseey

libs/s25main/RescaleWindowProp.h

@@ -22,7 +22,8 @@ struct ScaleWindowProp
     ScaleWindowProp(Extent oldSize, Extent newSize) : oldSize(oldSize), newSize(newSize) {}
 
     template<typename T_Pt>
-    static T_Pt scale(const T_Pt& value, const Extent& size, const ScaleLimPercent& scalePercentage = ScaleLimPercent(100, 100));
+    static T_Pt scale(const T_Pt& value, const Extent& size,
+                      const ScaleLimPercent& scalePercentage = ScaleLimPercent(100, 100));
 
     /// Scale the point or size from beeing relative to the oldSize to relative to the newSize
     template<typename T_Pt>
@@ -42,8 +43,9 @@ inline T_Pt ScaleWindowProp::operator()(const T_Pt& oldValue, const ScaleLimPerc
 {
     T_Pt realValue;
     T_Pt diff(oldSize - REFERENCE_RESOLUTION);
-    T_Pt limUnscaleValue(oldValue.x * REFERENCE_RESOLUTION.x / (oldSize.x - diff.x + (diff.x * scalePercentage.x / 100)),
-                            oldValue.y * REFERENCE_RESOLUTION.y / (oldSize.y - diff.y + (diff.y * scalePercentage.y / 100)));
+    T_Pt limUnscaleValue(
+      oldValue.x * REFERENCE_RESOLUTION.x / (oldSize.x - diff.x + (diff.x * scalePercentage.x / 100)),
+      oldValue.y * REFERENCE_RESOLUTION.y / (oldSize.y - diff.y + (diff.y * scalePercentage.y / 100)));
     realValue = limUnscaleValue;
     // Check for rounding errors
     T_Pt checkValue = ScaleWindowProp::scale(realValue, oldSize, scalePercentage);

libs/s25main/Window.cpp

@@ -17,7 +17,8 @@
 #include <boost/range/adaptor/reversed.hpp>
 #include <cstdarg>
 
-Window::Window(Window* parent, unsigned id, const DrawPoint& pos, const Extent& size, const ScaleLimPercent& scalePercentage)
+Window::Window(Window* parent, unsigned id, const DrawPoint& pos, const Extent& size,
+               const ScaleLimPercent& scalePercentage)
     : parent_(parent), id_(id), pos_(pos), size_(size), scalePercentage_(scalePercentage), active_(false),
       visible_(true), scale_(false), limit_(false), isInMouseRelay(false), animations_(this)
 {
@@ -310,8 +311,7 @@ ctrlDeepening* Window::AddImageDeepening(unsigned id, const DrawPoint& pos, cons
 ctrlEdit* Window::AddEdit(unsigned id, const DrawPoint& pos, const Extent& size, TextureColor tc, const glFont* font,
                           unsigned short maxlength, bool password, bool disabled, bool notify)
 {
-    return AddCtrl(
-      new ctrlEdit(this, id, pos, size, tc, font, maxlength, password, disabled, notify));
+    return AddCtrl(new ctrlEdit(this, id, pos, size, tc, font, maxlength, password, disabled, notify));
 }
 
 ctrlGroup* Window::AddGroup(unsigned id)
@@ -377,8 +377,8 @@ ctrlProgress* Window::AddProgress(unsigned id, const DrawPoint& pos, const Exten
                                   const std::string& tooltip, const Extent& padding, unsigned force_color,
                                   const std::string& button_minus_tooltip, const std::string& button_plus_tooltip)
 {
-    return AddCtrl(new ctrlProgress(this, id, pos, size, tc, button_minus, button_plus, maximum,
-                                    padding, force_color, tooltip, button_minus_tooltip, button_plus_tooltip));
+    return AddCtrl(new ctrlProgress(this, id, pos, size, tc, button_minus, button_plus, maximum, padding, force_color,
+                                    tooltip, button_minus_tooltip, button_plus_tooltip));
 }
 
 ctrlScrollBar* Window::AddScrollBar(unsigned id, const DrawPoint& pos, const Extent& size, unsigned short button_height,
@@ -450,8 +450,7 @@ ctrlVarDeepening* Window::AddVarDeepening(unsigned id, const DrawPoint& pos, con
     va_list liste;
     va_start(liste, parameters);
 
-    auto* ctrl =
-      new ctrlVarDeepening(this, id, pos, size, tc, formatstr, font, color, parameters, liste);
+    auto* ctrl = new ctrlVarDeepening(this, id, pos, size, tc, formatstr, font, color, parameters, liste);
 
     va_end(liste);
 
@@ -584,7 +583,8 @@ T_Pt Window::Scale(const T_Pt& pt, const ScaleLimPercent& scalePercentage)
 void Window::Scale()
 {
     pos_ = ScaleWindowProp::scale(pos_, VIDEODRIVER.GetRenderSize());
-    size_ = ScaleWindowProp::scale(size_, VIDEODRIVER.GetRenderSize(), limit_ ? scalePercentage_ : ScaleLimPercent(100, 100));
+    size_ =
+      ScaleWindowProp::scale(size_, VIDEODRIVER.GetRenderSize(), limit_ ? scalePercentage_ : ScaleLimPercent(100, 100));
 }
 
 template<class T_Pt>

libs/s25main/Window.h

@@ -67,7 +67,8 @@ class Window
     using KeyboardMsgHandler = bool (Window::*)(const KeyEvent&);
     using MouseMsgHandler = bool (Window::*)(const MouseCoords&);
 
-    Window(Window* parent, unsigned id, const DrawPoint& pos, const Extent& size = Extent(0, 0), const ScaleLimPercent& factors = ScaleLimPercent(100, 100));
+    Window(Window* parent, unsigned id, const DrawPoint& pos, const Extent& size = Extent(0, 0),
+           const ScaleLimPercent& scalePercentage = ScaleLimPercent(100, 100));
     virtual ~Window();
     /// zeichnet das Fenster.
     void Draw();
@@ -305,24 +306,24 @@ class Window
     /// Sets the limit value, deciding of control size shall be limited.
     void SetLimit(bool limit = true) { this->limit_ = limit; }
     /// get Scale-Value
-    bool GetScale() { return this->scale_; }
+    bool GetScale() const { return this->scale_; }
     /// get Limit-Value
-    bool GetLimit() { return this->limit_; }
+    bool GetLimit() const { return this->limit_; }
     /// zeichnet das Fenster.
     virtual void Draw_();
     /// Weiterleitung von Nachrichten von abgeleiteten Klassen erlaubt oder nicht?
     virtual bool IsMessageRelayAllowed() const;
 
 private:
-    Window* const parent_;      /// Handle auf das Parentfenster.
-    unsigned id_;               /// ID des Fensters.
-    DrawPoint pos_;             /// Position des Fensters.
-    Extent size_;               /// Höhe des Fensters.
-    ScaleLimPercent scalePercentage_; /// X and Y scaling limiting factors
-    bool active_;               /// Fenster aktiv?
-    bool visible_;              /// Fenster sichtbar?
-    bool scale_;                /// Sollen Controls an Fenstergröße angepasst werden?
-    bool limit_;                /// Should control size be limited?
+    Window* const parent_;              /// Handle auf das Parentfenster.
+    unsigned id_;                       /// ID des Fensters.
+    DrawPoint pos_;                     /// Position des Fensters.
+    Extent size_;                       /// Höhe des Fensters.
+    ScaleLimPercent scalePercentage_;   /// X and Y scaling limiting percentage
+    bool active_;                       /// Fenster aktiv?
+    bool visible_;                      /// Fenster sichtbar?
+    bool scale_;                        /// Sollen Controls an Fenstergröße angepasst werden?
+    bool limit_;                        /// Should control size be limited?
 
     std::map<Window*, Rect> lockedAreas_; /// gesperrte Regionen des Fensters.
     std::vector<Window*> tofreeAreas_;

libs/s25main/controls/ctrlChat.cpp

@@ -38,8 +38,8 @@ ctrlChat::ctrlChat(Window* parent, unsigned id, const DrawPoint& pos, const Exte
     SetScale(false);
 
     // Scrollbalken hinzufügen
-    AddScrollBar(0, DrawPoint(GetSize().x - SCROLLBAR_WIDTH, 0), Extent(SCROLLBAR_WIDTH, GetSize().y), SCROLLBAR_WIDTH, tc,
-                 page_size);
+    AddScrollBar(0, DrawPoint(GetSize().x - SCROLLBAR_WIDTH, 0), Extent(SCROLLBAR_WIDTH, GetSize().y), SCROLLBAR_WIDTH,
+                 tc, page_size);
 
     SetScale(tmpScale);