Rename offset theme param to font_offset

Author: oznogon

resources/gui/default.theme.txt

@@ -1,7 +1,7 @@
 [base] {
     font: gui/fonts/BigShouldersDisplay-SemiBold.ttf
     # Positive offset moves the font down, negative moves it up.
-    offset: 0.0
+    font_offset: 20.0
 
     [button] {
         color: #ffffff

src/gui/theme.cpp

@@ -99,7 +99,7 @@ bool GuiTheme::loadTheme(const string& name, const string& resource_name)
         else
             global_style.color = {255, 255, 255, 255};
         global_style.font = getFont(input["font"]);
-        global_style.offset = input["offset"].toFloat();
+        global_style.font_offset = input["font_offset"].toFloat();
         global_style.size = input["size"].toFloat();
         global_style.sound = input["sound"];
         for(unsigned int n=0; n<int(GuiElement::State::COUNT); n++)
@@ -130,8 +130,8 @@ bool GuiTheme::loadTheme(const string& name, const string& resource_name)
                 style.states[n].color = toColor(input["color." + postfix]);
             if (input.find("font." + postfix) != input.end())
                 style.states[n].font = getFont(input["font." + postfix]);
-            if (input.find("offset." + postfix) != input.end())
-                style.states[n].offset = input["font." + postfix].toFloat();
+            if (input.find("font_offset." + postfix) != input.end())
+                style.states[n].font_offset = input["font_offset." + postfix].toFloat();
             if (input.find("size." + postfix) != input.end())
                 style.states[n].size = input["size." + postfix].toFloat();
             if (input.find("sound." + postfix) != input.end())
@@ -155,7 +155,7 @@ GuiTheme::GuiTheme(const string& name)
     std::vector<string> fonts = findResources("gui/fonts/*.ttf");
     if(fonts.size() > 0)
         fallback_state.font = getFont(fonts[0]);
-    fallback_state.offset = 0.0f;
+    fallback_state.font_offset = 0.0f;
     fallback_state.texture = "";
     GuiThemeStyle fallback;
     for(unsigned int n=0; n<int(GuiElement::State::COUNT); n++)

src/gui/theme.h

@@ -16,7 +16,7 @@ class GuiThemeStyle
         glm::u8vec4 color;
         float size; //general size parameter, depends on the widget type what it means.
         sp::Font* font;
-        float offset = 0.0f;
+        float font_offset = 0.0f;
         string sound;   //Sound effect played by the widget on certain actions.
     };
     StateStyle states[int(GuiElement::State::COUNT)];

src/main.cpp

@@ -170,8 +170,8 @@ int main(int argc, char** argv)
 
     // Apply baseline offset adjustments to fonts
     // Positive values move text down, negative values move text up
-    main_font->setBaselineOffset(active_theme->getStyle("base")->get(GuiElement::State::Normal).offset);
-    bold_font->setBaselineOffset(active_theme->getStyle("bold")->get(GuiElement::State::Normal).offset);
+    main_font->setBaselineOffset(active_theme->getStyle("base")->get(GuiElement::State::Normal).font_offset);
+    bold_font->setBaselineOffset(active_theme->getStyle("bold")->get(GuiElement::State::Normal).font_offset);
 
     // On Android, this requires the 'record audio' permissions,
     // which is always a scary thing for users.