min

oxygine/src/oxygine/TextStyle.h

@@ -44,7 +44,7 @@ namespace oxygine
 
         int linesOffset;//vertical distance offset between lines
         int kerning;//horizontal distance
-        unsigned int options;//additional flags could be used for generating custom glyphs
+        size_t options;//additional flags could be used for generating custom glyphs
         bool multiline;
         bool breakLongWords;//works with multiline flag. breakLongWords = false doesn't allow to break too long words
         Color color;
@@ -76,7 +76,7 @@ namespace oxygine
 
         TextStyle withFontSize(int size) const { TextStyle st = *this; st.fontSize = size; return st; }
 
-        TextStyle withOptions(unsigned int opt) const { TextStyle st = *this; st.options = opt; return st; }
+        TextStyle withOptions(size_t opt) const { TextStyle st = *this; st.options = opt; return st; }
     };
 
     std::string dumpStyle(const TextStyle& s, bool onlydiff);

oxygine/src/oxygine/actor/TextField.cpp

@@ -115,7 +115,7 @@ namespace oxygine
         needRebuild();
     }
 
-    void TextField::setOptions(unsigned int opt)
+    void TextField::setOptions(size_t opt)
     {
         _style.options = opt;
         needRebuild();
@@ -261,7 +261,7 @@ namespace oxygine
         return _style.baselineScale;
     }
 
-    unsigned int TextField::getOptions() const
+    size_t TextField::getOptions() const
     {
         return _style.options;
     }

oxygine/src/oxygine/actor/TextField.h

@@ -41,7 +41,7 @@ namespace oxygine
         text::Symbol*               getSymbolAt(int pos) const;
         const Color&                getStyleColor() const;
         float                       getBaselineScale() const;
-        unsigned int                getOptions() const;
+        size_t                      getOptions() const;
 
 
         bool getBounds(RectF&) const override;
@@ -66,7 +66,7 @@ namespace oxygine
         /**Overwrites TextStyle color*/
         void setStyleColor(const Color&);
         /**Overwrites TextStyle options*/
-        void setOptions(unsigned int opt);
+        void setOptions(size_t opt);
 
         /**Overwrites TextStyle font.*/
         void setFont(const ResFont* rs);

oxygine/src/oxygine/text_utils/Aligner.h

@@ -48,7 +48,7 @@ namespace oxygine
             Rect bounds;
             int width;
             int height;
-            int options;
+            size_t options;
 
             spSTDMaterialX mat;
 

oxygine/src/oxygine/text_utils/Node.cpp

@@ -206,7 +206,7 @@ namespace oxygine
                 int i = 0;
                 const Font* font = rd._font;
 
-                const int opt = rd.options;
+                const size_t opt = rd.options;
 
                 while (i != (int)_data.size())
                 {
@@ -281,7 +281,7 @@ namespace oxygine
                 return;
             }
 
-            unsigned int prevOpt = rd.options;
+            size_t prevOpt = rd.options;
             rd.options = options;
             resizeChildren(rd);
             rd.options = prevOpt;