Ticket #3354: gui_cleanup_inc_on_2.patch

source/gui/CButton.cpp

@@ -83 +83 @@
     IGUITextOwner::HandleMessage(Message);
 }
 
-void CButton::Draw() 
+void CButton::Draw()
 {
     float bz = GetBufferedZ();
 

source/gui/CButton.h

@@ -22 +22 @@
 
 /**
  * Button
- * 
+ *
  * @see IGUIObject
  * @see IGUIButtonBehavior
  */

source/gui/CCheckBox.cpp

@@ -107 +107 @@
     }
 }
 
-void CCheckBox::Draw() 
+void CCheckBox::Draw()
 {
     float bz = GetBufferedZ();
     bool checked;
@@ -135 +135 @@
         GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite_disabled", sprite_disabled);
     }
 
-    DrawButton(m_CachedActualSize, 
+    DrawButton(m_CachedActualSize,
                bz,
                *sprite,
                *sprite_over,

source/gui/CCheckBox.h

@@ -22 +22 @@
 
 /**
  * CheckBox
- * 
+ *
  * @see IGUIObject
  * @see IGUISettingsObject
  * @see IGUIButtonBehavior

source/gui/CDropDown.cpp

@@ -44 +44 @@
     AddSetting(GUIST_CGUISpriteInstance,    "sprite2_pressed");
     AddSetting(GUIST_CGUISpriteInstance,    "sprite2_disabled");
     AddSetting(GUIST_EVAlign,               "text_valign");
-    
+
     // Add these in CList! And implement TODO
     //AddSetting(GUIST_CColor,              "textcolor_over");
     //AddSetting(GUIST_CColor,              "textcolor_pressed");
@@ -82 +82 @@
             Message.value == "button_width")
         {
             SetupListRect();
-        }       
+        }
 
         break;
     }
@@ -119 +119 @@
                 set = i;
             }
         }
-        
+
         if (set != -1)
         {
             //GUI<int>::SetSetting(this, "selected", set);
@@ -293 +293 @@
     if (ev->ev.type == SDL_KEYDOWN)
     {
         int szChar = ev->ev.key.keysym.sym;
-        
+
         switch (szChar)
         {
         case '\r':
@@ -332 +332 @@
                     m_InputBuffer = szChar;
                 else
                     m_InputBuffer += szChar;
-            
+
                 m_TimeOfLastInput = timer_Time();
-            
+
                 CGUIList* pList;
                 GUI<CGUIList>::GetSettingPointer(this, "list", pList);
                 // let's look for the closest element
@@ -429 +429 @@
         return m_CachedActualSize.PointInside(GetMousePos());
 }
 
-void CDropDown::Draw() 
+void CDropDown::Draw()
 {
     if (!GetGUI())
         return;
@@ -468 +468 @@
             GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite2_disabled", sprite2_second);
             GetGUI()->DrawSprite(GUI<>::FallBackSprite(*sprite2_second, *sprite2), cell_id, bz+0.05f, rect);
         }
-        else
-        if (m_Open)
+        else if (m_Open)
         {
             GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite2_pressed", sprite2_second);
             GetGUI()->DrawSprite(GUI<>::FallBackSprite(*sprite2_second, *sprite2), cell_id, bz+0.05f, rect);
         }
-        else
-        if (m_MouseHovering)
+        else if (m_MouseHovering)
         {
             GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite2_over", sprite2_second);
             GetGUI()->DrawSprite(GUI<>::FallBackSprite(*sprite2_second, *sprite2), cell_id, bz+0.05f, rect);
         }
-        else 
+        else
             GetGUI()->DrawSprite(*sprite2, cell_id, bz+0.05f, rect);
     }
 
@@ -506 +504 @@
             *scrollbar = false;
 
         DrawList(m_ElementHighlight, "sprite_list", "sprite_selectarea", "textcolor");
-        
+
         if (m_HideScrollBar)
             *scrollbar = old;
     }

source/gui/CDropDown.h

@@ -83 +83 @@
      * made that can change the visual.
      */
     void SetupText();
-    
+
     // Sets up the cached GetListRect. Decided whether it should
     //  have a scrollbar, and so on.
     virtual void SetupListRect();
@@ -111 +111 @@
     //  it is set to "selected", but then when moving the mouse it will
     //  change.
     int m_ElementHighlight;
-    
+
     // Stores any text entered by the user for quick access to an element
     // (ie if you type "acro" it will take you to acropolis).
     std::string m_InputBuffer;
-    
+
     // used to know if we want to restart anew or add to m_inputbuffer.
     double m_TimeOfLastInput;
 

source/gui/CGUI.cpp

@@ -82 +82 @@
         m_MousePos = CPos((float)ev->ev.motion.x * g_GuiScale, (float)ev->ev.motion.y * g_GuiScale);
 
         SGUIMessage msg(GUIM_MOUSE_MOTION);
-        GUI<SGUIMessage>::RecurseObject(GUIRR_HIDDEN | GUIRR_GHOST, m_BaseObject, 
-                                        &IGUIObject::HandleMessage, 
+        GUI<SGUIMessage>::RecurseObject(GUIRR_HIDDEN | GUIRR_GHOST, m_BaseObject,
+                                        &IGUIObject::HandleMessage,
                                         msg);
     }
 
@@ -125 +125 @@
         // Now we'll call UpdateMouseOver on *all* objects,
         //  we'll input the one hovered, and they will each
         //  update their own data and send messages accordingly
-        GUI<IGUIObject*>::RecurseObject(GUIRR_HIDDEN | GUIRR_GHOST, m_BaseObject, 
-                                        &IGUIObject::UpdateMouseOver, 
+        GUI<IGUIObject*>::RecurseObject(GUIRR_HIDDEN | GUIRR_GHOST, m_BaseObject,
+                                        &IGUIObject::UpdateMouseOver,
                                         pNearest);
 
         if (ev->ev.type == SDL_MOUSEBUTTONDOWN)
@@ -185 +185 @@
                 {
                     double timeElapsed = timer_Time() - pNearest->m_LastClickTime[SDL_BUTTON_LEFT];
                     pNearest->m_LastClickTime[SDL_BUTTON_LEFT] = timer_Time();
-                    
+
                     //Double click?
                     if (timeElapsed < SELECT_DBLCLICK_RATE)
                     {
@@ -202 +202 @@
                 {
                     double timeElapsed = timer_Time() - pNearest->m_LastClickTime[SDL_BUTTON_RIGHT];
                     pNearest->m_LastClickTime[SDL_BUTTON_RIGHT] = timer_Time();
-                    
+
                     //Double click?
                     if (timeElapsed < SELECT_DBLCLICK_RATE)
                     {
@@ -217 +217 @@
             }
 
             // Reset all states on all visible objects
-            GUI<>::RecurseObject(GUIRR_HIDDEN, m_BaseObject, 
+            GUI<>::RecurseObject(GUIRR_HIDDEN, m_BaseObject,
                                     &IGUIObject::ResetStates);
 
             // Since the hover state will have been reset, we reload it.
-            GUI<IGUIObject*>::RecurseObject(GUIRR_HIDDEN | GUIRR_GHOST, m_BaseObject, 
-                                            &IGUIObject::UpdateMouseOver, 
+            GUI<IGUIObject*>::RecurseObject(GUIRR_HIDDEN | GUIRR_GHOST, m_BaseObject,
+                                            &IGUIObject::UpdateMouseOver,
                                             pNearest);
         }
     }
@@ -263 +263 @@
             (ev->ev.type == SDL_KEYDOWN &&
                 ev->ev.key.keysym.sym != SDLK_ESCAPE &&
                 !g_keys[SDLK_LCTRL] && !g_keys[SDLK_RCTRL] &&
-                !g_keys[SDLK_LALT] && !g_keys[SDLK_RALT]) 
+                !g_keys[SDLK_LALT] && !g_keys[SDLK_RALT])
             || ev->ev.type == SDL_HOTKEYDOWN
 #if SDL_VERSION_ATLEAST(2, 0, 0)
             || ev->ev.type == SDL_TEXTINPUT || ev->ev.type == SDL_TEXTEDITING
@@ -281 +281 @@
 void CGUI::TickObjects()
 {
     CStr action = "tick";
-    GUI<CStr>::RecurseObject(0, m_BaseObject, 
+    GUI<CStr>::RecurseObject(0, m_BaseObject,
                             &IGUIObject::ScriptEvent, action);
 
     // Also update tooltips:
@@ -297 +297 @@
     // (sending events here) wasn't converting to lower case,
     // leading to a similar problem.
     // now fixed; case is irrelevant since all are converted to lower.
-    GUI<CStr>::RecurseObject(0, m_BaseObject, 
+    GUI<CStr>::RecurseObject(0, m_BaseObject,
         &IGUIObject::ScriptEvent, EventName.LowerCase());
 }
 
@@ -308 +308 @@
     GuiScriptingInit(*m_ScriptInterface);
     m_ScriptInterface->LoadGlobalScripts();
     m_BaseObject = new CGUIDummyObject;
-    m_BaseObject->SetGUI(this); 
+    m_BaseObject->SetGUI(this);
 }
 
 CGUI::~CGUI()
@@ -508 +508 @@
 
     // Some help functions
     // TODO Gee: CRect => CPoint ?
-    void SetupSpriteCall(const bool Left, SGUIText::SSpriteCall& SpriteCall, 
+    void SetupSpriteCall(const bool Left, SGUIText::SSpriteCall& SpriteCall,
                          const float width, const float y,
-                         const CSize& Size, const CStr& TextureName, 
+                         const CSize& Size, const CStr& TextureName,
                          const float BufferZone, const int CellID)
     {
         // TODO Gee: Temp hardcoded values
         SpriteCall.m_Area.top = y+BufferZone;
         SpriteCall.m_Area.bottom = y+BufferZone + Size.cy;
-        
+
         if (Left)
         {
             SpriteCall.m_Area.left = BufferZone;
@@ -585 +585 @@
                                 FirstLine);
 
         // Loop through our images queues, to see if images has been added.
-        
+
         // Check if this has already been processed.
         //  Also, floating images are only applicable if Word-Wrapping is on
         if (WordWrapping && i > pos_last_img)
@@ -604 +604 @@
                     if (!Images[j].empty())
                         _y = std::max(y, Images[j].back().m_YTo);
                     else
-                        _y = y; 
+                        _y = y;
 
                     // Get Size from Icon database
                     SGUIIcon icon = GetIcon(imgname);
@@ -660 +660 @@
 
                         union_from = std::max(y, img.m_YFrom);
                         union_to = std::min(y+prelim_line_height, img.m_YTo);
-                        
+
                         // The union is not empty
                         if (union_to > union_from)
                         {
@@ -748 +748 @@
 
                 // Defaults
                 string.GenerateTextCall(this, Feedback2, Font,
-                                        string.m_Words[j], string.m_Words[j+1], 
+                                        string.m_Words[j], string.m_Words[j+1],
                                         FirstLine, pObject);
 
                 // Iterate all and set X/Y values
@@ -1310 +1310 @@
             if (!object->HandleAdditionalChildren(child, pFile))
                 LOGERROR("GUI: (object: %s) Reading unknown children for its type", object->GetPresentableName().c_str());
         }
-    } 
+    }
 
     //
     //  Check if Z wasn't manually set
@@ -1437 +1437 @@
 {
     // Sprite object we're adding
     CGUISprite* Sprite = new CGUISprite;
-    
+
     // and what will be its reference name
     CStr name;
 
@@ -1504 +1504 @@
 
     // Image object we're adding
     SGUIImage* Image = new SGUIImage;
-    
+
     // Set defaults to "0 0 100% 100%"
     Image->m_TextureSize = CClientArea(CRect(0, 0, 0, 0), CRect(0, 0, 100, 100));
     Image->m_Size = CClientArea(CRect(0, 0, 0, 0), CRect(0, 0, 100, 100));
-    
+
     // TODO Gee: Setup defaults here (or maybe they are in the SGUIImage ctor)
 
     //
@@ -1726 +1726 @@
     for (XMBAttribute attr : Element.GetAttributes())
     {
         CStr attr_name = pFile->GetAttributeString(attr.Name);
-        CStr attr_value(attr.Value); 
+        CStr attr_value(attr.Value);
 
         if (attr_value == "null")
             continue;
@@ -1792 +1792 @@
     }
 
     //
-    //  Add to CGUI 
+    //  Add to CGUI
     //
 
     m_ScrollBarStyles[name] = scrollbar;
@@ -1871 +1871 @@
     CColor color;
     CStr name = attributes.GetNamedItem(pFile->GetAttributeID("name"));
 
-    // Try parsing value 
+    // Try parsing value
     CStr value(Element.GetText());
     if (value.empty())
         return;

source/gui/CGUI.h

@@ -49 +49 @@
  */
 struct SGUIStyle
 {
-    // A list of defaults for 
+    // A list of defaults for
     std::map<CStr, CStrW> m_SettingsDefaults;
 };
 
@@ -74 +74 @@
 class CGUI
 {
     NONCOPYABLE(CGUI);
-    
+
     friend class IGUIObject;
     friend class IGUIScrollBarOwner;
     friend class CInternalCGUIAccessorBase;
@@ -91 +91 @@
      * Initializes the GUI, needs to be called before the GUI is used
      */
     void Initialize();
-    
+
     /**
      * Performs processing that should happen every frame
      * (including sending the "Tick" event to scripts)
@@ -185 +185 @@
      * The GUI needs to have all object types inputted and
      * their constructors. Also it needs to associate a type
      * by a string name of the type.
-     * 
+     *
      * To add a type:
      * @code
      * AddObjectType("button", &CButton::ConstructObject);
@@ -216 +216 @@
      * will be sent to the Renderer. Also, horizontal alignment
      * is taken into acount in this method but NOT vertical alignment.
      *
-     * Done through the CGUI since it can communicate with 
+     * Done through the CGUI since it can communicate with
      *
      * @param Text Text to generate SGUIText object from
      * @param Font Default font, notice both Default color and default font
      *        can be changed by tags.
      * @param Width Width, 0 if no word-wrapping.
      * @param BufferZone space between text and edge, and space between text and images.
-     * @param pObject Optional parameter for error output. Used *only* if error parsing fails, 
-     *        and we need to be able to output which object the error occured in to aid the user. 
+     * @param pObject Optional parameter for error output. Used *only* if error parsing fails,
+     *        and we need to be able to output which object the error occured in to aid the user.
      */
     SGUIText GenerateText(const CGUIString& Text, const CStrW& Font, const float& Width, const float& BufferZone, const IGUIObject* pObject = NULL);
 
@@ -244 +244 @@
      * Returns false if it fails.
      */
     bool GetPreDefinedColor(const CStr& name, CColor& Output) const;
-    
+
     shared_ptr<ScriptInterface> GetScriptInterface() { return m_ScriptInterface; };
     jsval GetGlobalObject() { return m_ScriptInterface->GetGlobalObject(); };
 
@@ -263 +263 @@
 
     /**
      * Adds an object to the GUI's object database
-     * Private, since you can only add objects through 
+     * Private, since you can only add objects through
      * XML files. Why? Because it enables the GUI to
      * be much more encapsulated and safe.
      *
@@ -512 +512 @@
      * @see LoadXmlFile()
      */
     void Xeromyces_ReadIcon(XMBElement Element, CXeromyces* pFile);
-    
+
     /**
      * Reads in the element \<tooltip\> (the XMBElement) and stores the
      * result as an object with the name __tooltip_#.
@@ -547 +547 @@
     /** @name Miscellaneous */
     //--------------------------------------------------------
     //@{
-    
+
     shared_ptr<ScriptInterface> m_ScriptInterface;
 
     /**
-     * don't want to pass this around with the 
+     * don't want to pass this around with the
      * ChooseMouseOverAndClosest broadcast -
      * we'd need to pack this and pNearest in a struct
      */
@@ -593 +593 @@
      */
     IGUIObject* m_FocusedObject;
 
-    /** 
+    /**
      * Just pointers for fast name access, each object
      * is really constructed within its parent for easy
      * recursive management.

source/gui/CGUIScrollBarVertical.cpp

@@ -61 +61 @@
         // Draw background
         GetGUI()->DrawSprite(GetStyle()->m_SpriteBackVertical,
                              0,
-                             m_Z+0.1f, 
+                             m_Z+0.1f,
                              CRect(outline.left,
                                    outline.top+(GetStyle()->m_UseEdgeButtons?GetStyle()->m_Width:0),
                                    outline.right,
@@ -95 +95 @@
             }
             else
                 button_bottom = &GetStyle()->m_SpriteButtonBottom;
-            
+
             // Draw top button
             GetGUI()->DrawSprite(*button_top,
                                  0,
@@ -105 +105 @@
                                        outline.right,
                                        outline.top+GetStyle()->m_Width)
                                 );
-            
+
             // Draw bottom button
             GetGUI()->DrawSprite(*button_bottom,
                                  0,
@@ -123 +123 @@
                              m_Z + 0.2f,
                              GetBarRect());
     }
-} 
+}
 
 void CGUIScrollBarVertical::HandleMessage(SGUIMessage& Message)
 {

source/gui/CGUISprite.cpp

@@ -1 @@
-/* Copyright (C) 2015 Wildfire Games 
+/* Copyright (C) 2015 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify

source/gui/CGUISprite.h

@@ -61 +61 @@
         m_Effects(NULL), m_Border(false), m_DeltaZ(0.f)
     {
     }
-    
+
     ~SGUIImage()
     {
         delete m_Effects;

source/gui/CImage.cpp

@@ -35 +35 @@
 {
 }
 
-void CImage::Draw() 
+void CImage::Draw()
 {
     if (!GetGUI())
         return;

source/gui/CImage.h

@@ -29 +29 @@
  * without functionality used, and that is a lot of unnecessary
  * overhead. That's why I thought I'd go with an intuitive
  * control.
- * 
+ *
  * @see IGUIObject
  */
 class CImage : public IGUIObject

source/gui/CInput.cpp

@@ -226 +226 @@
                 if (m_iBufferPos == (int)pCaption->length())
                     *pCaption = pCaption->Left((long)pCaption->length()-1);
                 else
-                    *pCaption = pCaption->Left(m_iBufferPos-1) + 
+                    *pCaption = pCaption->Left(m_iBufferPos-1) +
                                 pCaption->Right((long)pCaption->length()-m_iBufferPos);
 
                 --m_iBufferPos;
@@ -248 +248 @@
                 if (pCaption->empty() || m_iBufferPos == (int)pCaption->length())
                     break;
 
-                *pCaption = pCaption->Left(m_iBufferPos) + 
+                *pCaption = pCaption->Left(m_iBufferPos) +
                             pCaption->Right((long)pCaption->length()-(m_iBufferPos+1));
 
                 UpdateText(m_iBufferPos, m_iBufferPos+1, m_iBufferPos);
@@ -326 +326 @@
                 else if (!SelectingText())
                     m_iBufferPos_Tail = m_iBufferPos;
 
-                if (m_iBufferPos > 0) 
+                if (m_iBufferPos > 0)
                     --m_iBufferPos;
             }
             else
@@ -556 +556 @@
             if (m_iBufferPos == (int)pCaption->length())
                 *pCaption += text;
             else
-                *pCaption = pCaption->Left(m_iBufferPos) + text + 
+                *pCaption = pCaption->Left(m_iBufferPos) + text +
                 pCaption->Right((long) pCaption->length()-m_iBufferPos);
 
             UpdateText(m_iBufferPos, m_iBufferPos, m_iBufferPos+1);
@@ -642 +642 @@
             DeleteCurSelection();
         }
         return IN_HANDLED;
-    } 
+    }
     else if (hotkey == "text.delete.right")
     {
         m_WantedX = 0.0f;
@@ -802 +802 @@
 
         // Update scroll-bar
         // TODO Gee: (2004-09-01) Is this really updated each time it should?
-        if (scrollbar && 
-            (Message.value == CStr("size") || 
+        if (scrollbar &&
+            (Message.value == CStr("size") ||
              Message.value == CStr("z") ||
              Message.value == CStr("absolute")))
         {
@@ -828 +828 @@
             m_iBufferPos_Tail = -1; // position change resets selection
         }
 
-        if (Message.value == CStr("size") || 
+        if (Message.value == CStr("size") ||
             Message.value == CStr("z") ||
-            Message.value == CStr("font") || 
+            Message.value == CStr("font") ||
             Message.value == CStr("absolute") ||
             Message.value == CStr("caption") ||
             Message.value == CStr("scrollbar") ||
@@ -1225 +1225 @@
     // Set the Z to somewhat more, so we can draw a selected area between the
     //  the control and the text.
     textRenderer.Translate(
-        (float)(int)(m_CachedActualSize.left) + buffer_zone, 
+        (float)(int)(m_CachedActualSize.left) + buffer_zone,
         (float)(int)(m_CachedActualSize.top+h) + buffer_zone,
         bz+0.1f);
 
@@ -1291 +1291 @@
                 if (it->m_ListStart + i == VirtualFrom)
                 {
                     // we won't actually draw it now, because we don't
-                    //  know the width of each glyph to that position. 
+                    //  know the width of each glyph to that position.
                     //  we need to go along with the iteration, and
                     //  make a mark where the box started:
                     drawing_box = true; // will turn false when finally rendered.
@@ -1327 +1327 @@
                     // Set 'rect' depending on if it's a multiline control, or a one-line control
                     if (multiline)
                     {
-                        rect = CRect(m_CachedActualSize.left+box_x+buffer_zone, 
+                        rect = CRect(m_CachedActualSize.left+box_x+buffer_zone,
                                    m_CachedActualSize.top+buffered_y+(h-ls)/2,
-                                   m_CachedActualSize.left+x_pointer+buffer_zone, 
+                                   m_CachedActualSize.left+x_pointer+buffer_zone,
                                    m_CachedActualSize.top+buffered_y+(h+ls)/2);
 
                         if (rect.bottom < m_CachedActualSize.top)
@@ -1343 +1343 @@
                     }
                     else // if one-line
                     {
-                        rect = CRect(m_CachedActualSize.left+box_x+buffer_zone-m_HorizontalScroll, 
+                        rect = CRect(m_CachedActualSize.left+box_x+buffer_zone-m_HorizontalScroll,
                                    m_CachedActualSize.top+buffered_y+(h-ls)/2,
-                                   m_CachedActualSize.left+x_pointer+buffer_zone-m_HorizontalScroll, 
+                                   m_CachedActualSize.left+x_pointer+buffer_zone-m_HorizontalScroll,
                                    m_CachedActualSize.top+buffered_y+(h+ls)/2);
 
                         if (rect.left < m_CachedActualSize.left)
@@ -1426 +1426 @@
                 }
 
                 // End of selected area, change back color
-                if (SelectingText() && 
+                if (SelectingText() &&
                     it->m_ListStart + i == VirtualTo)
                 {
                     using_selected_color = false;
@@ -1440 +1440 @@
                     textRenderer.Put(0.0f, 0.0f, L"_");
 
                 // Drawing selected area
-                if (SelectingText() && 
+                if (SelectingText() &&
                     it->m_ListStart + i >= VirtualFrom &&
                     it->m_ListStart + i < VirtualTo &&
                     using_selected_color == false)
@@ -1551 +1551 @@
 
         std::list<SRow>::iterator destroy_row_from;
         std::list<SRow>::iterator destroy_row_to;
-        // Used to check if the above has been set to anything, 
+        // Used to check if the above has been set to anything,
         //  previously a comparison like:
         //  destroy_row_from == std::list<SRow>::iterator()
         // ... was used, but it didn't work with GCC.
@@ -1563 +1563 @@
         //  to be redone. And when going along, we'll delete a row at a time
         //  when continuing to see how much more after 'to' we need to remake.
         int i = 0;
-        for (std::list<SRow>::iterator it = m_CharacterPositions.begin(); 
+        for (std::list<SRow>::iterator it = m_CharacterPositions.begin();
              it != m_CharacterPositions.end();
              ++it, ++i)
         {
@@ -1578 +1578 @@
 
                 // For the rare case that we might remove characters to a word
                 //  so that it suddenly fits on the previous row,
-                //  we need to by standards re-do the whole previous line too 
+                //  we need to by standards re-do the whole previous line too
                 //  (if one exists)
                 if (destroy_row_from != m_CharacterPositions.begin())
                     --destroy_row_from;
@@ -1592 +1592 @@
                 destroy_row_to_used = true;
 
                 // If it isn't the last row, we'll add another row to delete,
-                //  just so we can see if the last restorted line is 
+                //  just so we can see if the last restorted line is
                 //  identical to what it was before. If it isn't, then we'll
                 //  have to continue.
                 // 'check_point_row_start' is where we store how the that
@@ -1746 +1746 @@
         //  also check if the current line isn't the end
         if (to_before != -1 && i == to-1 && current_line != m_CharacterPositions.end())
         {
-            // check all rows and see if any existing 
+            // check all rows and see if any existing
             if (row.m_ListStart != check_point_row_start)
             {
                 std::list<SRow>::iterator destroy_row_from;
                 std::list<SRow>::iterator destroy_row_to;
-                // Are used to check if the above has been set to anything, 
+                // Are used to check if the above has been set to anything,
                 //  previously a comparison like:
                 //  destroy_row_from == std::list<SRow>::iterator()
                 //  was used, but it didn't work with GCC.
@@ -1763 +1763 @@
                 //  to be redone. And when going along, we'll delete a row at a time
                 //  when continuing to see how much more after 'to' we need to remake.
                 int i = 0;
-                for (std::list<SRow>::iterator it = m_CharacterPositions.begin(); 
+                for (std::list<SRow>::iterator it = m_CharacterPositions.begin();
                      it != m_CharacterPositions.end();
                      ++it, ++i)
                 {
@@ -1787 +1787 @@
                         destroy_row_to_used = true;
 
                         // If it isn't the last row, we'll add another row to delete,
-                        //  just so we can see if the last restorted line is 
+                        //  just so we can see if the last restorted line is
                         //  identical to what it was before. If it isn't, then we'll
                         //  have to continue.
                         // 'check_point_row_start' is where we store how the that
@@ -1860 +1860 @@
     }
 }
 
-int CInput::GetMouseHoveringTextPosition()
+int CInput::GetMouseHoveringTextPosition() const
 {
     if (m_CharacterPositions.empty())
         return 0;
@@ -1873 +1873 @@
     GUI<float>::GetSetting(this, "buffer_zone", buffer_zone);
     GUI<bool>::GetSetting(this, "multiline", multiline);
 
-    std::list<SRow>::iterator current = m_CharacterPositions.begin();
+    std::list<SRow>::const_iterator current = m_CharacterPositions.begin();
 
     CPos mouse = GetMousePos();
 
@@ -1887 +1887 @@
 
         float scroll = 0.f;
         if (scrollbar)
-            scroll = GetScrollBar(0).GetPos();
-
-        // Pointer to caption, will come in handy
-        CStrW* pCaption = (CStrW*)m_Settings["caption"].m_pSetting;
-        UNUSED2(pCaption);
+            scroll = GetScrollBarPos(0);
 
         // Now get the height of the font.
                         // TODO: Get the real font
         CFontMetrics font(font_name);
         float spacing = (float)font.GetLineSpacing();
-        //float height = (float)font.GetHeight();   // unused
 
         // Change mouse position relative to text.
         mouse -= m_CachedActualSize.TopLeft();
         mouse.x -= buffer_zone;
         mouse.y += scroll - buffer_zone;
 
-        //if ((m_CharacterPositions.size()-1) * spacing + height < mouse.y)
-        //  m_iBufferPos = pCaption->Length();
-        int row = (int)((mouse.y) / spacing);//m_CharachterPositions.size()
+        int row = (int)((mouse.y) / spacing);
 
         if (row < 0)
             row = 0;
@@ -1929 +1922 @@
         // mouse.y is moot
     }
 
-    //m_iBufferPos = m_CharacterPositions.get.m_ListStart;
     retPosition = current->m_ListStart;
 
     // Okay, now loop through the glyphs to find the appropriate X position
@@ -1940 +1932 @@
 }
 
 // Does not process horizontal scrolling, 'x' must be modified before inputted.
-int CInput::GetXTextPosition(const std::list<SRow>::iterator& current, const float& x, float& wanted)
+int CInput::GetXTextPosition(const std::list<SRow>::const_iterator& current, const float& x, float& wanted) const
 {
     int ret = 0;
     float previous = 0.f;
     int i = 0;
 
-    for (std::vector<float>::iterator it = current->m_ListOfX.begin();
+    for (std::vector<float>::const_iterator it = current->m_ListOfX.begin();
          it != current->m_ListOfX.end();
          ++it, ++i)
     {
@@ -1992 +1984 @@
         virtualTo = m_iBufferPos;
     }
 
-    *pCaption = pCaption->Left(virtualFrom) + 
+    *pCaption = pCaption->Left(virtualFrom) +
                 pCaption->Right((long)pCaption->length() - virtualTo);
 
     UpdateText(virtualFrom, virtualTo, virtualFrom);

source/gui/CInput.h

@@ -47 +47 @@
 
     // Check where the mouse is hovering, and get the appropriate text position.
     //  return is the text-position index.
-    // const in philosophy, but I need to retrieve the caption in a non-const way.
-    int GetMouseHoveringTextPosition();
+    int GetMouseHoveringTextPosition() const;
 
-    // Same as above, but only on one row in X, and a given value, not the mouse's
-    //  wanted is filled with x if the row didn't extend as far as we 
-    int GetXTextPosition(const std::list<SRow>::iterator& c, const float& x, float& wanted);
+    // Same as above, but only on one row in X, and a given value, not the mouse's.
+    //  wanted is filled with x if the row didn't extend as far as the mouse pos.
+    int GetXTextPosition(const std::list<SRow>::const_iterator& c, const float& x, float& wanted) const;
 
 protected:
     /**

source/gui/CList.cpp

@@ -104 +104 @@
 
     // Generate texts
     float buffered_y = 0.f;
-    
+
     for (size_t i = 0; i < pList->m_Items.size(); ++i)
     {
         // Create a new SGUIText. Later on, input it using AddText()
@@ -119 +119 @@
     }
 
     m_ItemsYPositions[pList->m_Items.size()] = buffered_y;
-    
+
     // Setup scrollbar
     if (scrollbar)
     {
@@ -152 +152 @@
             // TODO: Check range
 
             // TODO only works if lower-case, shouldn't it be made case sensitive instead?
-            ScriptEvent("selectionchange"); 
+            ScriptEvent("selectionchange");
         }
 
         if (Message.value == "scrollbar")
@@ -206 +206 @@
                 set = i;
             }
         }
-        
+
         if (set != -1)
         {
             GUI<int>::SetSetting(this, "selected", set);
@@ -286 +286 @@
     return result;
 }
 
-void CList::Draw() 
+void CList::Draw()
 {
     int selected;
     GUI<int>::GetSetting(this, "selected", selected);
-    
+
     DrawList(selected, "sprite", "sprite_selectarea", "textcolor");
 }
 
@@ -411 +411 @@
     if (child.GetNodeName() == elmt_item)
     {
         AddItem(child.GetText().FromUTF8(), child.GetText().FromUTF8());
-        
         return true;
     }
-    else
-    {
-        return false;
-    }
+
+    return false;
 }
 
 void CList::SelectNextElement()
@@ -438 +435 @@
             g_SoundManager->PlayAsUI(soundPath.c_str(), false);
     }
 }
-    
+
 void CList::SelectPrevElement()
 {
     int selected;
@@ -463 +460 @@
     if (selected >= 0)
         GUI<int>::SetSetting(this, "selected", 0);
 }
-    
+
 void CList::SelectLastElement()
 {
     int selected;

source/gui/COList.cpp

@@ -152 +152 @@
         CPos mouse = GetMousePos();
         if (!m_CachedActualSize.PointInside(mouse))
             return;
-        
+
         float xpos = 0;
         for (size_t def = 0; def < m_ObjectsDefs.size(); ++def)
         {
@@ -361 +361 @@
     CRect rect_head(m_CachedActualSize.left, m_CachedActualSize.top, m_CachedActualSize.right,
                                     m_CachedActualSize.top + m_HeadingHeight);
     GetGUI()->DrawSprite(*sprite_heading, cell_id, bz, rect_head);
-    
+
     CGUISpriteInstance* sprite_order;
     CGUISpriteInstance* sprite_not_sorted;
     if (m_SelectedColumnOrder != -1)

source/gui/COList.h

@@ -32 +32 @@
 /**
  * Multi-column list. One row can be selected by the user.
  * Individual cells are clipped if the contained text is too long.
- * 
- * The list can be sorted dynamically by JS code when a 
+ *
+ * The list can be sorted dynamically by JS code when a
  * heading is ckicked.
  * A scroll-bar will appear when needed.
  */

source/gui/CProgressBar.cpp

@@ -61 +61 @@
     }
 }
 
-void CProgressBar::Draw() 
+void CProgressBar::Draw()
 {
     if (!GetGUI())
         return;

source/gui/CProgressBar.h

@@ -22 +22 @@
 
 /**
  * Object used to draw a value (e.g. progress) from 0 to 100 visually.
- * 
+ *
  * @see IGUIObject
  */
 class CProgressBar : public IGUIObject

source/gui/CRadioButton.h

@@ -24 +24 @@
 /**
  * Just like a check box, but it'll nullify its siblings (of the same kind),
  * and it won't switch itself.
- * 
+ *
  * @see CCheckBox
  */
 class CRadioButton : public CCheckBox

source/gui/CText.cpp

@@ -182 +182 @@
     IGUITextOwner::HandleMessage(Message);
 }
 
-void CText::Draw() 
+void CText::Draw()
 {
     float bz = GetBufferedZ();
 

source/gui/CText.h

@@ -22 +22 @@
 
 /**
  * Text field that just displays static text.
- * 
+ *
  * @see IGUIObject
  */
 class CText : public IGUIScrollBarOwner, public IGUITextOwner

source/gui/CTooltip.cpp

@@ -87 +87 @@
     CPos mousepos, offset;
     EVAlign anchor;
     bool independent;
-    
+
     GUI<bool>::GetSetting(this, "independent", independent);
     if (independent)
         mousepos = GetMousePos();
@@ -147 +147 @@
     IGUITextOwner::HandleMessage(Message);
 }
 
-void CTooltip::Draw() 
+void CTooltip::Draw()
 {
     if (!GetGUI())
         return;

source/gui/GUIManager.cpp

@@ -114 +114 @@
 {
     shared_ptr<ScriptInterface::StructuredClone> initDataClone = m_PageStack.back().initData;
     PopPage();
-    
+
     shared_ptr<ScriptInterface> scriptInterface = m_PageStack.back().gui->GetScriptInterface();
     JSContext* cx = scriptInterface->GetContext();
     JS::RootedValue initDataVal(cx);
-    if (initDataClone)
-        scriptInterface->ReadStructuredClone(initDataClone, &initDataVal);
-    else
+    if (!initDataClone)
     {
         LOGERROR("Called PopPageCB when initData (which should contain the callback function name) isn't set!");
         return;
     }
-    
+
+    scriptInterface->ReadStructuredClone(initDataClone, &initDataVal);
+
     if (!scriptInterface->HasProperty(initDataVal, "callback"))
     {
         LOGERROR("Called PopPageCB when the callback function name isn't set!");
         return;
     }
-    
+
     std::string callback;
     if (!scriptInterface->GetProperty(initDataVal, "callback", callback))
     {
         LOGERROR("Failed to get the callback property as a string from initData in PopPageCB!");
         return;
     }
-    
+
     JS::RootedValue global(cx, scriptInterface->GetGlobalObject());
     if (!scriptInterface->HasProperty(global, callback.c_str()))
     {
@@ -182 +182 @@
         shared_ptr<ScriptInterface> scriptInterface = page.gui->GetScriptInterface();
         JSContext* cx = scriptInterface->GetContext();
         JSAutoRequest rq(cx);
-        
+
         JS::RootedValue global(cx, scriptInterface->GetGlobalObject());
         JS::RootedValue hotloadDataVal(cx);
-        scriptInterface->CallFunction(global, "getHotloadData", &hotloadDataVal); 
+        scriptInterface->CallFunction(global, "getHotloadData", &hotloadDataVal);
         hotloadData = scriptInterface->WriteStructuredClone(hotloadDataVal);
     }
-        
+
     page.inputs.clear();
     page.gui.reset(new CGUI(m_ScriptRuntime));
 
@@ -252 +252 @@
     shared_ptr<ScriptInterface> scriptInterface = page.gui->GetScriptInterface();
     JSContext* cx = scriptInterface->GetContext();
     JSAutoRequest rq(cx);
-    
+
     JS::RootedValue initDataVal(cx);
     JS::RootedValue hotloadDataVal(cx);
     JS::RootedValue global(cx, scriptInterface->GetGlobalObject());
-    if (page.initData) 
+    if (page.initData)
         scriptInterface->ReadStructuredClone(page.initData, &initDataVal);
     if (hotloadData)
         scriptInterface->ReadStructuredClone(hotloadData, &hotloadDataVal);
-    
+
     // Call the init() function
     if (!scriptInterface->CallFunctionVoid(
-            global, 
-            "init", 
-            initDataVal, 
+            global,
+            "init",
+            initDataVal,
             hotloadDataVal)
         )
     {
@@ -302 +302 @@
     shared_ptr<ScriptInterface> scriptInterface = top()->GetScriptInterface();
     JSContext* cx = scriptInterface->GetContext();
     JSAutoRequest rq(cx);
-    
+
     JS::RootedValue data(cx);
     JS::RootedValue global(cx, top()->GetGlobalObject());
     scriptInterface->CallFunction(global, "getSavedGameData", &data);
@@ -314 +314 @@
     shared_ptr<ScriptInterface> scriptInterface = top()->GetScriptInterface();
     JSContext* cx = scriptInterface->GetContext();
     JSAutoRequest rq(cx);
-    
+
     JS::RootedValue global(cx, top()->GetGlobalObject());
     JS::RootedValue dataVal(cx);
     scriptInterface->ParseJSON(jsonData, &dataVal);
@@ -329 +329 @@
     // visible game area), sometimes they'll want to intercepts events before the GUI (e.g.
     // to capture all mouse events until a mouseup after dragging).
     // So we call two separate handler functions:
-    
+
     bool handled;
 
     {
@@ -392 +392 @@
     // We share the script runtime with everything else that runs in the same thread.
     // This call makes sure we trigger GC regularly even if the simulation is not running.
     m_ScriptInterface->GetRuntime()->MaybeIncrementalGC(1.0f);
-    
+
     // Save an immutable copy so iterators aren't invalidated by tick handlers
     PageStackType pageStack = m_PageStack;
 

source/gui/GUIManager.h

@@ -51 +51 @@
     CGUIManager();
     ~CGUIManager();
 
-    shared_ptr<ScriptInterface> GetScriptInterface() 
-    { 
-        return m_ScriptInterface; 
+    shared_ptr<ScriptInterface> GetScriptInterface()
+    {
+        return m_ScriptInterface;
     }
     shared_ptr<ScriptRuntime> GetRuntime() { return m_ScriptRuntime; }
     shared_ptr<CGUI> GetActiveGUI() { return top(); }
@@ -136 +136 @@
      * Calls the current page's script function getSavedGameData() and returns the result.
      */
     std::string GetSavedGameData();
- 
+
     void RestoreSavedGameData(std::string jsonData);
 
     /**
@@ -165 +165 @@
     void LoadPage(SGUIPage& page);
 
     shared_ptr<CGUI> top() const;
-    
+
     shared_ptr<CGUI> m_CurrentGUI; // used to latch state during TickObjects/LoadPage (this is kind of ugly)
     shared_ptr<ScriptRuntime> m_ScriptRuntime;
     shared_ptr<ScriptInterface> m_ScriptInterface;

source/gui/GUIRenderer.cpp

@@ -86 +86 @@
         {
             // TODO: Should check (nicely) that this is a valid file?
             SGUIImage* Image = new SGUIImage;
-            
+
             // Allow grayscale images for disabled portraits
             if (SpriteName.substr(10, 10) == "grayscale:")
             {
@@ -107 +107 @@
             Sprite->AddImage(Image);
 
             Sprites[SpriteName] = Sprite;
-            
+
             it = Sprites.find(SpriteName);
             ENSURE(it != Sprites.end()); // The insertion above shouldn't fail
         }
@@ -118 +118 @@
 
             double xRatio = SpriteName.BeforeFirst(",").AfterLast("(").ToDouble();
             double yRatio = SpriteName.BeforeFirst(")").AfterLast(",").ToDouble();
-            
+
             int PathStart = SpriteName.Find(")") + 1;
-            
+
             Image->m_TextureName = VfsPath("art/textures/ui") / wstring_from_utf8(SpriteName.substr(PathStart));
 
             CClientArea ca(CRect(0, 0, 0, 0), CRect(0, 0, 100, 100));
@@ -132 +132 @@
             Sprite->AddImage(Image);
 
             Sprites[SpriteName] = Sprite;
-            
+
             it = Sprites.find(SpriteName);
             ENSURE(it != Sprites.end()); // The insertion above shouldn't fail
         }
@@ -437 +437 @@
             }
 #undef ADD
         }
-        
+
         cit->m_Shader->EndPass();
 
         glDisable(GL_BLEND);

source/gui/GUITooltip.cpp

@@ -332 +332 @@
             // Mouse moved onto a new object
 
             if (GetTooltip(Nearest, style))
-            {   
+            {
                 CStr style_old;
 
-                // If we're displaying a tooltip with no delay, then we want to 
+                // If we're displaying a tooltip with no delay, then we want to
                 //  reset so that other object that should have delay can't
                 //  "ride this tail", it have to wait.
                 // Notice that this doesn't apply to when you go from one delay=0
@@ -354 +354 @@
                 }
             }
             else
-            {   
+            {
                 nextstate = ST_COOLING;
             }
         }

source/gui/GUIbase.h

@@ -20 +20 @@
 
 --Overview--
 
-    Contains defines, includes, types etc that the whole 
+    Contains defines, includes, types etc that the whole
      GUI should have included.
 
 --More info--
@@ -50 +50 @@
     static IGUIObject* ConstructObject() { return new obj(); }
 
 
-/** 
+/**
  * Message types.
  * @see SGUIMessage
  */
@@ -78 +78 @@
     GUIM_LOST_FOCUS,
     GUIM_PRESSED_MOUSE_RIGHT,
     GUIM_DOUBLE_PRESSED_MOUSE_RIGHT,
-    GUIM_TAB                // Used by CInput 
+    GUIM_TAB                // Used by CInput
 };
 
 /**
@@ -182 +182 @@
      *
      * "0 0 100% 100%"
      * "50%-10 50%-10 50%+10 50%+10"
-     * 
+     *
      * i.e. First percent modifier, then + or - and the pixel modifier.
      * Although you can use just the percent or the pixel modifier. Notice
      * though that the percent modifier must always be the first when

source/gui/GUItext.h

@@ -39 +39 @@
 
 /**
  * An SGUIText object is a parsed string, divided into
- * text-rendering components. Each component, being a 
+ * text-rendering components. Each component, being a
  * call to the Renderer. For instance, if you by tags
  * change the color, then the GUI will have to make
  * individual calls saying it want that color on the
@@ -89 +89 @@
      */
     struct STextCall
     {
-        STextCall() : 
+        STextCall() :
             m_UseCustomColor(false),
             m_Bold(false), m_Italic(false), m_Underlined(false),
             m_pSpriteCall(NULL) {}

source/gui/GUIutil.cpp

@@ -32 +32 @@
         Output = true;
     else if (Value == L"false")
         Output = false;
-    else 
+    else
         return false;
 
     return true;
@@ -329 +329 @@
     std::map<CStr, SGUISetting>::const_iterator it = pObject->m_Settings.find(Setting);
     if (it == pObject->m_Settings.end())
     {
-        LOGWARNING("setting %s was not found on object %s", 
+        LOGWARNING("setting %s was not found on object %s",
             Setting.c_str(),
             pObject->GetPresentableName().c_str());
         return PSRETURN_GUI_InvalidSetting;
@@ -377 +377 @@
 
     if (!pObject->SettingExists(Setting))
     {
-        LOGWARNING("setting %s was not found on object %s", 
+        LOGWARNING("setting %s was not found on object %s",
             Setting.c_str(),
             pObject->GetPresentableName().c_str());
         return PSRETURN_GUI_InvalidSetting;

source/gui/GUIutil.h

@@ -50 +50 @@
 struct SGUIMessage;
 
 /**
- * Base class to only the class GUI. This superclass is 
+ * Base class to only the class GUI. This superclass is
  * kind of a templateless extention of the class GUI.
  * Used for other functions to friend with, because it
  * can't friend with GUI since it's templated (at least
@@ -61 +61 @@
 protected:
     /// Get object pointer
     static IGUIObject* GetObjectPointer(CGUI& GUIinstance, const CStr& Object);
-    
+
     /// const version
     static const IGUIObject* GetObjectPointer(const CGUI& GUIinstance, const CStr& Object);
 
@@ -73 +73 @@
 
 
 #ifndef NDEBUG
-// Used to ensure type-safety, sort of 
+// Used to ensure type-safety, sort of
 template<typename T> void CheckType(const IGUIObject* obj, const CStr& setting);
 #endif
 
@@ -141 +141 @@
     }
 
     /**
-     * Sets a value by setting and object name using a real 
+     * Sets a value by setting and object name using a real
      * datatype as input
      *
      * This is just a wrapper so that we can type the object name
@@ -167 +167 @@
 
         return SetSetting(pObject, Setting, Value, SkipMessage);
     }
-    
+
     /**
      * This will return the value of the first sprite if it's not null,
      * if it is null, it will return the value of the second sprite, if
@@ -197 +197 @@
     }
 
     /**
-     * Sets a value by setting and object name using a real 
+     * Sets a value by setting and object name using a real
      * datatype as input.
      *
      * This is just a wrapper for __ParseString() which really
@@ -256 +256 @@
             return;
 
         (pObject->*pFunc)(Argument);
-        
+
         // Iterate children
         for (IGUIObject* const& obj : *pObject)
             RecurseObject(RR, obj, pFunc, Argument);
@@ -273 +273 @@
             return;
 
         (pObject->*pFunc)(Argument);
-        
+
         // Iterate children
         for (IGUIObject* const& obj : *pObject)
             RecurseObject(RR, obj, pFunc, Argument);

source/gui/IGUIObject.cpp

@@ -100 +100 @@
             // If anything went wrong, reverse what we did and throw
             //  an exception telling it never added a child
             m_Children.erase(m_Children.end()-1);
-            
+
             throw;
         }
     }
@@ -177 +177 @@
 }
 
 CPos IGUIObject::GetMousePos() const
-{ 
-    return ((GetGUI())?(GetGUI()->m_MousePos):CPos()); 
+{
+    if (GetGUI())
+        return GetGUI()->m_MousePos;
+
+    return CPos();
 }
 
 void IGUIObject::UpdateMouseOver(IGUIObject* const& pMouseOver)
@@ -309 +312 @@
 
     CClientArea ca;
     GUI<CClientArea>::GetSetting(this, "size", ca);
-    
+
     // If absolute="false" and the object has got a parent,
     //  use its cached size instead of the screen. Notice
     //  it must have just been cached for it to work.
@@ -385 +388 @@
         else
         {
             // In philosophy, a parentless object shouldn't be able to have a relative sizing,
-            //  but we'll accept it so that absolute can be used as default without a complaint. 
+            //  but we'll accept it so that absolute can be used as default without a complaint.
             //  Also, you could consider those objects children to the screen resolution.
             return Z;
         }
@@ -396 +399 @@
 {
     if(!GetGUI())
         throw PSERROR_GUI_OperationNeedsGUIObject();
-        
+
     JSContext* cx = pGUI->GetScriptInterface()->GetContext();
     JSAutoRequest rq(cx);
     JS::RootedValue globalVal(cx, pGUI->GetGlobalObject());
     JS::RootedObject globalObj(cx, &globalVal.toObject());
-    
+
     const int paramCount = 1;
     const char* paramNames[paramCount] = { "mouse" };
 
@@ -422 +425 @@
 
     if (!func)
         return; // JS will report an error message
-    
+
     JS::RootedObject funcObj(cx, JS_GetFunctionObject(func));
     SetScriptHandler(Action, funcObj);
 }
@@ -528 +531 @@
 
 void IGUIObject::SetFocus()
 {
-    GetGUI()->m_FocusedObject = this; 
+    GetGUI()->m_FocusedObject = this;
 }
 
 bool IGUIObject::IsFocused() const
 {
-    return GetGUI()->m_FocusedObject == this; 
+    return GetGUI()->m_FocusedObject == this;
 }
 
 bool IGUIObject::IsRootObject() const
@@ -549 +552 @@
 
 PSRETURN IGUIObject::LogInvalidSettings(const CStr8& Setting) const
 {
-    LOGWARNING("IGUIObject: setting %s was not found on an object", 
+    LOGWARNING("IGUIObject: setting %s was not found on an object",
         Setting.c_str());
     return PSRETURN_GUI_InvalidSetting;
 }

source/gui/IGUIObject.h

@@ -176 +176 @@
     void AddToPointersMap(map_pObjects& ObjectMap);
 
     /**
-     * Notice nothing will be returned or thrown if the child hasn't 
-     * been inputted into the GUI yet. This is because that's were 
+     * Notice nothing will be returned or thrown if the child hasn't
+     * been inputted into the GUI yet. This is because that's were
      * all is checked. Now we're just linking two objects, but
      * it's when we're inputting them into the GUI we'll check
      * validity! Notice also when adding it to the GUI this function
@@ -219 +219 @@
      * @return True if settings exist.
      */
     bool SettingExists(const CStr& Setting) const;
-    
+
     /**
      * All sizes are relative to resolution, and the calculation
      * is not wanted in real time, therefore it is cached, update
@@ -257 +257 @@
      * @param pGUI GUI instance to associate the script with
      */
     void RegisterScriptHandler(const CStr& Action, const CStr& Code, CGUI* pGUI);
-    
+
     /**
      * Retrieves the JSObject representing this GUI object.
      */
@@ -290 +290 @@
      * MEGA TODO Should it destroy it's children?
      */
     virtual void Destroy();
-    
+
 public:
     /**
      * This function is called with different messages
@@ -353 +353 @@
      * Set parent of this object
      */
     void SetParent(IGUIObject* pParent) { m_pParent = pParent; }
-    
+
     /**
      * Reset internal state of this object
      */
@@ -459 +459 @@
     /** @name Internal functions */
     //--------------------------------------------------------
     //@{
-    
+
     /**
      * Inputs a reference pointer, checks if the new inputted object
      * if hovered, if so, then check if this's Z value is greater
@@ -518 +518 @@
      * read. This is important to know because I don't want to force
      * the user to include its \<styles\>-XML-files first, so somehow
      * the GUI needs to know which settings were set, and which is meant
-     * to 
+     * to.
      */
 
     // More variables
@@ -543 +543 @@
 
     // Internal storage for registered script handlers.
     std::map<CStr, JS::Heap<JSObject*> > m_ScriptHandlers;
-    
+
     // Cached JSObject representing this GUI object
     DefPersistentRooted<JSObject*>           m_JSObject;
 };

source/gui/IGUIScrollBar.cpp

@@ -23 +23 @@
 IGUIScrollBar::IGUIScrollBar() : m_pStyle(NULL), m_pGUI(NULL),
                                  m_X(300.f), m_Y(300.f),
                                  m_ScrollRange(1.f), m_ScrollSpace(0.f), // MaxPos: not 0, due to division.
-                                 m_Length(200.f), m_Width(20.f), 
+                                 m_Length(200.f), m_Width(20.f),
                                  m_BarSize(0.f), m_Pos(0.f),
                                  m_ButtonPlusPressed(false),
                                  m_ButtonMinusPressed(false),
@@ -69 +69 @@
     return m_pHostObject->GetScrollBarStyle(m_ScrollBarStyle);
 }
 
-CGUI* IGUIScrollBar::GetGUI() const 
-{ 
+CGUI* IGUIScrollBar::GetGUI() const
+{
     if (!m_pHostObject)
         return NULL;
 
-    return m_pHostObject->GetGUI(); 
+    return m_pHostObject->GetGUI();
 }
 
 void IGUIScrollBar::UpdatePosBoundaries()

source/gui/IGUIScrollBar.h

@@ -89 +89 @@
      * in pixels.
      */
     float m_MaximumBarSize;
-    
+
     /**
      * True if you want edge buttons, i.e. buttons that can be pressed in order
      * to scroll.
@@ -252 +252 @@
      * @param width Width
      */
     void SetWidth(float width) { m_Width = width; }
-    
+
     /**
      * Set X Position
      * @param x Position in this axis
@@ -341 +341 @@
     /**
      * Width of the scroll bar
      */
-    float m_Width;  
+    float m_Width;
 
     /**
      * Absolute X Position

source/gui/IGUIScrollBarOwner.cpp

@@ -68 +68 @@
         sb->HandleMessage(msg);
 }
 
-void IGUIScrollBarOwner::Draw() 
+void IGUIScrollBarOwner::Draw()
 {
     for (IGUIScrollBar* const& sb : m_ScrollBars)
         sb->Draw();
 }
+
+float IGUIScrollBarOwner::GetScrollBarPos(const int index) const
+{
+    return m_ScrollBars[index]->GetPos();
+}

source/gui/IGUIScrollBarOwner.h

@@ -69 +69 @@
         return *m_ScrollBars[index];
     }
 
+    /**
+     * Get the position of the scroll bar at @param index.
+     * Equivalent to GetScrollbar(index).GetPos().
+     */
+    virtual float GetScrollBarPos(const int index) const;
+
 protected:
 
     /**

source/gui/MiniMap.cpp

@@ -86 +86 @@
     m_AttributePos.type = GL_FLOAT;
     m_AttributePos.elems = 2;
     m_VertexArray.AddAttribute(&m_AttributePos);
-    
+
     m_AttributeColor.type = GL_UNSIGNED_BYTE;
     m_AttributeColor.elems = 4;
     m_VertexArray.AddAttribute(&m_AttributeColor);
-    
+
     m_VertexArray.SetNumVertices(MAX_ENTITIES_DRAWN);
     m_VertexArray.Layout();
 
@@ -236 +236 @@
 {
     JSContext* cx = g_GUI->GetActiveGUI()->GetScriptInterface()->GetContext();
     JSAutoRequest rq(cx);
-    
+
     float x, z;
     GetMouseWorldCoordinates(x, z);
 
@@ -283 +283 @@
     glScissor(
         m_CachedActualSize.left / g_GuiScale,
         g_Renderer.GetHeight() - m_CachedActualSize.bottom / g_GuiScale,
-        width / g_GuiScale, 
+        width / g_GuiScale,
         height / g_GuiScale);
     glEnable(GL_SCISSOR_TEST);
     glLineWidth(2.0f);
@@ -405 +405 @@
     const double cur_time = timer_Time();
     const bool doUpdate = cur_time - last_time > 0.5;
     if (doUpdate)
-    {   
+    {
         last_time = cur_time;
         if (m_TerrainDirty)
             RebuildTerrainTexture();

source/gui/MiniMap.h

@@ -84 +84 @@
 
     // 1.f if map is circular or 1.414f if square (to shrink it inside the circle)
     float m_MapScale;
-    
+
     // maximal water height to allow the passage of a unit (for underwater shallows).
     float m_ShallowPassageHeight;
 

source/gui/scripting/JSInterface_GUITypes.cpp

@@ -30 +30 @@
         NULL, NULL, JSI_GUISize::construct, NULL
 };
 
-JSFunctionSpec JSI_GUISize::JSI_methods[] = 
+JSFunctionSpec JSI_GUISize::JSI_methods[] =
 {
     JS_FS("toString", JSI_GUISize::toString, 0, 0),
     JS_FS_END
@@ -138 +138 @@
         NULL, NULL, JSI_GUIColor::construct, NULL
 };
 
-JSFunctionSpec JSI_GUIColor::JSI_methods[] = 
+JSFunctionSpec JSI_GUIColor::JSI_methods[] =
 {
     JS_FS("toString", JSI_GUIColor::toString, 0, 0),
     JS_FS_END
@@ -148 +148 @@
 {
     JSAutoRequest rq(cx);
     JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
-    
+
     ScriptInterface* pScriptInterface = ScriptInterface::GetScriptInterfaceAndCBData(cx)->pScriptInterface;
     JS::RootedObject obj(cx, pScriptInterface->CreateCustomObject("GUIColor"));
-    
+
     if (args.length() == 4)
     {
         JS_SetProperty(cx, obj, "r", args[0]);
@@ -208 +208 @@
         NULL, NULL, JSI_GUIMouse::construct, NULL
 };
 
-JSFunctionSpec JSI_GUIMouse::JSI_methods[] = 
+JSFunctionSpec JSI_GUIMouse::JSI_methods[] =
 {
     JS_FS("toString", JSI_GUIMouse::toString, 0, 0),
     JS_FS_END

source/gui/scripting/JSInterface_IGUIObject.cpp

@@ -594 +594 @@
     JSAutoRequest rq(cx);
     JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
     ScriptInterface* pScriptInterface = ScriptInterface::GetScriptInterfaceAndCBData(cx)->pScriptInterface;
-    
+
     if (args.length() == 0)
     {
         JS_ReportError(cx, "GUIObject has no default constructor");
@@ -622 +622 @@
     JS::CallReceiver rec = JS::CallReceiverFromVp(vp);
 
     JS::RootedObject thisObj(cx, JS_THIS_OBJECT(cx, vp));
-    
+
     IGUIObject* e = (IGUIObject*)JS_GetInstancePrivate(cx, thisObj, &JSI_IGUIObject::JSI_class, NULL);
     if (!e)
         return false;
@@ -640 +640 @@
     JS::CallReceiver rec = JS::CallReceiverFromVp(vp);
 
     JS::RootedObject thisObj(cx, JS_THIS_OBJECT(cx, vp));
-    
+
     IGUIObject* e = (IGUIObject*)JS_GetInstancePrivate(cx, thisObj, &JSI_IGUIObject::JSI_class, NULL);
     if (!e)
         return false;
@@ -657 +657 @@
     JS::CallReceiver rec = JS::CallReceiverFromVp(vp);
 
     JS::RootedObject thisObj(cx, JS_THIS_OBJECT(cx, vp));
- 
+
     IGUIObject* e = (IGUIObject*)JS_GetInstancePrivate(cx, thisObj, &JSI_IGUIObject::JSI_class, NULL);
     if (!e)
         return false;
@@ -672 +672 @@
 {
     JSAutoRequest rq(cx);
     JS::CallReceiver rec = JS::CallReceiverFromVp(vp);
-    
+
     JS::RootedObject thisObj(cx, JS_THIS_OBJECT(cx, vp));
-    
+
     IGUIObject* e = (IGUIObject*)JS_GetInstancePrivate(cx, thisObj, &JSI_IGUIObject::JSI_class, NULL);
     if (!e)
         return false;

source/gui/scripting/ScriptFunctions.cpp

@@ -217 +217 @@
     CSimulation2* sim = g_Game->GetSimulation2();
     JSContext* cxSim = sim->GetScriptInterface().GetContext();
     JSAutoRequest rqSim(cxSim);
-    
-    JS::RootedValue gameAttribs(cxSim, 
+
+    JS::RootedValue gameAttribs(cxSim,
         sim->GetScriptInterface().CloneValueFromOtherContext(*(pCxPrivate->pScriptInterface), attribs));
 
     g_Game->SetPlayerID(playerID);
@@ -230 +230 @@
     // We need to be careful with different compartments and contexts.
     // The GUI calls this function from the GUI context and expects the return value in the same context.
     // The game we start from here creates another context and expects data in this context.
-    
+
     JSContext* cxGui = pCxPrivate->pScriptInterface->GetContext();
     JSAutoRequest rq(cxGui);
 
@@ -247 +247 @@
         return JS::UndefinedValue();
 
     g_Game = new CGame();
-    
+
     {
         CSimulation2* sim = g_Game->GetSimulation2();
         JSContext* cxGame = sim->GetScriptInterface().GetContext();
         JSAutoRequest rq(cxGame);
-        
-        JS::RootedValue gameContextMetadata(cxGame, 
+
+        JS::RootedValue gameContextMetadata(cxGame,
             sim->GetScriptInterface().CloneValueFromOtherContext(*(pCxPrivate->pScriptInterface), guiContextMetadata));
         JS::RootedValue gameInitAttributes(cxGame);
         sim->GetScriptInterface().GetProperty(gameContextMetadata, "initAttributes", &gameInitAttributes);
@@ -464 +464 @@
 
     JSContext* cx = g_Game->GetSimulation2()->GetScriptInterface().GetContext();
     JSAutoRequest rq(cx);
-    
+
     JS::RootedValue mapSettings(cx);
     g_Game->GetSimulation2()->GetMapSettings(&mapSettings);
     return pCxPrivate->pScriptInterface->CloneValueFromOtherContext(
@@ -888 +888 @@
 void StartJsTimer(ScriptInterface::CxPrivate* pCxPrivate, unsigned int slot)
 {
     ONCE(InitJsTimers(*(pCxPrivate->pScriptInterface)));
-    
+
     if (slot >= MAX_JS_TIMERS)
         LOGERROR("Exceeded the maximum number of timer slots for scripts!");
 
@@ -923 +923 @@
     JSI_Sound::RegisterScriptFunctions(scriptInterface);
     JSI_L10n::RegisterScriptFunctions(scriptInterface);
     JSI_Lobby::RegisterScriptFunctions(scriptInterface);
- 
+
     // VFS (external)
     scriptInterface.RegisterFunction<JS::Value, std::wstring, std::wstring, bool, &JSI_VFS::BuildDirEntList>("BuildDirEntList");
     scriptInterface.RegisterFunction<bool, CStrW, JSI_VFS::FileExists>("FileExists");