mirror of
https://github.com/edubart/otclient.git
synced 2025-10-20 14:33:26 +02:00
Just some refactoring
This commit is contained in:
@@ -41,7 +41,7 @@ public:
|
||||
bool isUIBoxLayout() { return true; }
|
||||
|
||||
protected:
|
||||
Boolean<false> m_fitChildren;
|
||||
bool m_fitChildren = false;
|
||||
int m_spacing;
|
||||
};
|
||||
|
||||
|
@@ -55,9 +55,9 @@ private:
|
||||
int m_cellSpacing;
|
||||
int m_numColumns;
|
||||
int m_numLines;
|
||||
Boolean<false> m_autoSpacing;
|
||||
Boolean<false> m_fitChildren;
|
||||
Boolean<false> m_flow;
|
||||
bool m_autoSpacing = false;
|
||||
bool m_fitChildren = false;
|
||||
bool m_flow = false;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@@ -39,7 +39,7 @@ public:
|
||||
protected:
|
||||
bool internalUpdate();
|
||||
|
||||
Boolean<false> m_alignRight;
|
||||
bool m_alignRight = false;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@@ -58,8 +58,8 @@ protected:
|
||||
virtual bool internalUpdate() = 0;
|
||||
|
||||
int m_updateDisabled;
|
||||
Boolean<false> m_updating;
|
||||
Boolean<false> m_updateScheduled;
|
||||
bool m_updating = false;
|
||||
bool m_updateScheduled = false;
|
||||
UIWidgetPtr m_parentWidget;
|
||||
};
|
||||
|
||||
|
@@ -82,8 +82,8 @@ private:
|
||||
UIWidgetPtr m_draggingWidget;
|
||||
UIWidgetPtr m_hoveredWidget;
|
||||
UIWidgetPtr m_pressedWidget;
|
||||
Boolean<false> m_hoverUpdateScheduled;
|
||||
Boolean<false> m_drawDebugBoxes;
|
||||
bool m_hoverUpdateScheduled = false;
|
||||
bool m_drawDebugBoxes = false;
|
||||
std::unordered_map<std::string, OTMLNodePtr> m_styles;
|
||||
UIWidgetList m_destroyedWidgets;
|
||||
ScheduledEventPtr m_checkEvent;
|
||||
|
@@ -40,7 +40,7 @@ public:
|
||||
protected:
|
||||
bool internalUpdate();
|
||||
|
||||
Boolean<false> m_alignBottom;
|
||||
stdext::boolean<false> m_alignBottom;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@@ -61,14 +61,14 @@ protected:
|
||||
std::string m_id;
|
||||
Rect m_rect;
|
||||
Point m_virtualOffset;
|
||||
Boolean<true> m_enabled;
|
||||
Boolean<true> m_visible;
|
||||
Boolean<true> m_focusable;
|
||||
Boolean<false> m_fixedSize;
|
||||
Boolean<false> m_phantom;
|
||||
Boolean<false> m_dragable;
|
||||
Boolean<false> m_destroyed;
|
||||
Boolean<false> m_clipping;
|
||||
stdext::boolean<true> m_enabled;
|
||||
stdext::boolean<true> m_visible;
|
||||
stdext::boolean<true> m_focusable;
|
||||
stdext::boolean<false> m_fixedSize;
|
||||
stdext::boolean<false> m_phantom;
|
||||
stdext::boolean<false> m_dragable;
|
||||
stdext::boolean<false> m_destroyed;
|
||||
stdext::boolean<false> m_clipping;
|
||||
UILayoutPtr m_layout;
|
||||
UIWidgetPtr m_parent;
|
||||
UIWidgetList m_children;
|
||||
@@ -155,8 +155,8 @@ public:
|
||||
UIWidgetPtr backwardsGetWidgetById(const std::string& id);
|
||||
|
||||
private:
|
||||
Boolean<false> m_updateEventScheduled;
|
||||
Boolean<false> m_loadingStyle;
|
||||
stdext::boolean<false> m_updateEventScheduled;
|
||||
stdext::boolean<false> m_loadingStyle;
|
||||
|
||||
|
||||
// state managment
|
||||
@@ -171,8 +171,8 @@ private:
|
||||
void updateChildrenIndexStates();
|
||||
void updateStyle();
|
||||
|
||||
Boolean<false> m_updateStyleScheduled;
|
||||
Boolean<true> m_firstOnStyle;
|
||||
stdext::boolean<false> m_updateStyleScheduled;
|
||||
stdext::boolean<true> m_firstOnStyle;
|
||||
OTMLNodePtr m_stateStyle;
|
||||
int m_states;
|
||||
|
||||
@@ -394,8 +394,8 @@ private:
|
||||
|
||||
CoordsBuffer m_imageCoordsBuffer;
|
||||
Rect m_imageCachedScreenCoords;
|
||||
Boolean<true> m_imageMustRecache;
|
||||
Boolean<false> m_imageBordered;
|
||||
stdext::boolean<true> m_imageMustRecache;
|
||||
stdext::boolean<false> m_imageBordered;
|
||||
|
||||
protected:
|
||||
void drawImage(const Rect& screenCoords);
|
||||
@@ -404,9 +404,9 @@ protected:
|
||||
Rect m_imageClipRect;
|
||||
Rect m_imageRect;
|
||||
Color m_imageColor;
|
||||
Boolean<false> m_imageFixedRatio;
|
||||
Boolean<false> m_imageRepeated;
|
||||
Boolean<false> m_imageSmooth;
|
||||
stdext::boolean<false> m_imageFixedRatio;
|
||||
stdext::boolean<false> m_imageRepeated;
|
||||
stdext::boolean<false> m_imageSmooth;
|
||||
EdgeGroup<int> m_imageBorder;
|
||||
|
||||
public:
|
||||
@@ -451,7 +451,7 @@ private:
|
||||
void updateText();
|
||||
void parseTextStyle(const OTMLNodePtr& styleNode);
|
||||
|
||||
Boolean<true> m_textMustRecache;
|
||||
stdext::boolean<true> m_textMustRecache;
|
||||
CoordsBuffer m_textCoordsBuffer;
|
||||
Rect m_textCachedScreenCoords;
|
||||
|
||||
@@ -465,8 +465,8 @@ protected:
|
||||
std::string m_drawText;
|
||||
Fw::AlignmentFlag m_textAlign;
|
||||
Point m_textOffset;
|
||||
Boolean<false> m_textWrap;
|
||||
Boolean<false> m_textAutoResize;
|
||||
stdext::boolean<false> m_textWrap;
|
||||
stdext::boolean<false> m_textAutoResize;
|
||||
BitmapFontPtr m_font;
|
||||
|
||||
public:
|
||||
|
Reference in New Issue
Block a user