General code cleanups

* Removed some unused includes and forward declarations.

* Use std::unique_ptr to automate cleanup.

* Use TextRenderer::renderText in BrowserBox to avoid code duplication.

* Removed unused STATE_NORMAL from StateFlags.

* Small layout fix in ServerDialog.

* Reduced rewrapping delay in BrowserBox to 33ms and disabled it
  entirely when there are no more than 1000 lines to rewrap. The
  rewrapping is usually fast enough.

1 files changed, 25 insertions, 0 deletions

diff --git a/data/graphics/gui/theme.xml b/data/graphics/gui/theme.xml
index 2dfb5a5f..b0484c45 100644
--- a/data/graphics/gui/theme.xml
+++ b/data/graphics/gui/theme.xml
@@ -50,21 +50,25 @@
       <img src="window.png" left="4" right="4" top="4" bottom="4" fill="repeat" />
     </state>
   </skin>
+
   <skin type="ResizeGrip" padding="3">
     <state>
       <img src="resize.png" />
     </state>
   </skin>
+
   <skin type="Popup" padding="6">
     <state>
       <img src="window.png" left="4" right="4" top="4" bottom="4" fill="repeat" />
     </state>
   </skin>
+
   <skin type="SpeechBubble">
     <state>
       <img src="bubble.png|W:#000000" left="5" right="5" top="5" bottom="5" height="15" />
     </state>
   </skin>
+
   <skin type="Button" padding="4">
     <state disabled="true">
       <text color="#333333" />
@@ -80,6 +84,7 @@
       <img src="button.png" left="10" right="10" top="5" bottom="5" />
     </state>
   </skin>
+
   <skin type="Tab" padding="4">
     <state selected="true">
       <img src="tabselected.png" left="10" right="10" top="5" bottom="9" />
@@ -91,6 +96,7 @@
       <img src="tab.png" left="10" right="10" top="14" bottom="2" />
     </state>
   </skin>
+
   <skin type="CheckBox" padding="3" spacing="4">
     <state disabled="true" selected="true">
       <img src="checkbox.png" x="27" y="0" width="9" height="10" offsetX="2" offsetY="5" />
@@ -111,6 +117,7 @@
       <img src="checkbox.png" x="0" y="0" width="9" height="10" offsetX="2" offsetY="5" />
     </state>
   </skin>
+
   <skin type="RadioButton" padding="3" spacing="4">
     <state hovered="true" selected="true">
       <img src="radioin_highlight.png" offsetX="2" offsetY="5" />
@@ -125,21 +132,25 @@
       <img src="radioout.png" offsetX="2" offsetY="5" />
     </state>
   </skin>
+
   <skin type="TextField" frameSize="2" padding="2">
     <state>
       <img src="deepbox.png" left="4" right="4" top="4" bottom="4" />
     </state>
   </skin>
+
   <skin type="ScrollArea" frameSize="2" padding="2">
     <state>
       <img src="deepbox.png" left="4" right="4" top="4" bottom="4" />
     </state>
   </skin>
+
   <skin type="DropDownFrame" frameSize="2" padding="1">
     <state>
       <img src="deepbox.png" left="4" right="4" top="4" bottom="4" />
     </state>
   </skin>
+
   <skin type="DropDownButton">
     <state selected="true" hovered="true">
       <img src="vscroll_up_pressed.png" offsetX="-2" offsetY="2" />
@@ -154,16 +165,19 @@
       <img src="vscroll_down_default.png" offsetX="-2" offsetY="2" />
     </state>
   </skin>
+
   <skin type="ScrollAreaVBar">
     <state>
       <rect color="#000000" alpha="32" />
     </state>
   </skin>
+
   <skin type="ScrollAreaHBar">
     <state>
       <rect color="#000000" alpha="32" />
     </state>
   </skin>
+
   <skin type="ScrollAreaHMarker">
     <state hovered="true">
       <img src="vscroll_highlight.png" left="4" right="4" top="4" bottom="4" fill="repeat" />
@@ -172,6 +186,7 @@
       <img src="vscroll_grey.png" left="4" right="4" top="4" bottom="4" fill="repeat" />
     </state>
   </skin>
+
   <skin type="ScrollAreaVMarker">
     <state hovered="true">
       <img src="vscroll_highlight.png" left="4" right="4" top="4" bottom="4" fill="repeat" />
@@ -180,12 +195,14 @@
       <img src="vscroll_grey.png" left="4" right="4" top="4" bottom="4" fill="repeat" />
     </state>
   </skin>
+
   <skin type="ProgressBar">
     <state>
       <text color="#ffffff" outlineColor="#000000"/>
       <img src="vscroll_grey.png" left="4" right="4" top="4" bottom="4" fill="repeat" />
     </state>
   </skin>
+
   <skin type="Slider" padding="4">
     <state hovered="true">
       <img src="slider_hilight.png" height="6" left="4" right="4" top="6" offsetY="4" />
@@ -194,6 +211,7 @@
       <img src="slider.png" height="6" left="4" right="4" top="6" offsetY="4" />
     </state>
   </skin>
+
   <skin type="SliderHandle">
     <state hovered="true">
       <img src="slider_hilight.png" x="6" y="8" width="9" height="10" offsetY="2" />
@@ -202,6 +220,7 @@
       <img src="slider.png" x="6" y="8" width="9" height="10" offsetY="2" />
     </state>
   </skin>
+
   <skin type="ButtonUp">
     <state selected="true">
       <img src="vscroll_up_pressed.png" />
@@ -210,6 +229,7 @@
       <img src="vscroll_up_default.png" />
     </state>
   </skin>
+
   <skin type="ButtonDown">
     <state selected="true">
       <img src="vscroll_down_pressed.png" />
@@ -218,6 +238,7 @@
       <img src="vscroll_down_default.png" />
     </state>
   </skin>
+
   <skin type="ButtonLeft">
     <state selected="true">
       <img src="hscroll_left_pressed.png" />
@@ -226,6 +247,7 @@
       <img src="hscroll_left_default.png" />
     </state>
   </skin>
+
   <skin type="ButtonRight">
     <state selected="true">
       <img src="hscroll_right_pressed.png" />
@@ -234,11 +256,13 @@
       <img src="hscroll_right_default.png" />
     </state>
   </skin>
+
   <skin type="ButtonClose" padding="3">
     <state>
       <img src="close_button.png" />
     </state>
   </skin>
+
   <skin type="ButtonSticky" padding="3">
     <state selected="true">
       <img src="sticky_button.png" x="15" width="15" height="15" />
@@ -247,6 +271,7 @@
       <img src="sticky_button.png" width="15" height="15" />
     </state>
   </skin>
+
   <skin type="ShortcutBox">
     <state>
       <img src="item_shortcut_bgr.png" />