Tweaked classic theme in 320x200 mode, to use the available space better

svn-id: r34902

5 files changed, 310 insertions, 312 deletions

diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index ca9fca3f21..dece0d9571 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -1,4 +1,310 @@
  "<?xml version = '1.0'?>"
+"<render_info> "
+"<palette> "
+"<color name = 'black' "
+"rgb = '0, 0, 0' "
+"/> "
+"<color name = 'lightgrey' "
+"rgb = '104, 104, 104' "
+"/> "
+"<color name = 'darkgrey' "
+"rgb = '64, 64, 64' "
+"/> "
+"<color name = 'green' "
+"rgb = '32, 160, 32' "
+"/> "
+"<color name = 'green2' "
+"rgb = '0, 255, 0' "
+"/> "
+"</palette> "
+"<fonts> "
+"<font id = 'text_default' "
+"file = 'default' "
+"color = 'green' "
+"/> "
+"<font id = 'text_hover' "
+"file = 'default' "
+"color = 'green2' "
+"/> "
+"<font id = 'text_disabled' "
+"file = 'default' "
+"color = 'lightgrey' "
+"/> "
+"<font id = 'text_inverted' "
+"file = 'default' "
+"color = 'black' "
+"/> "
+"<font id = 'text_button' "
+"file = 'default' "
+"color = 'green' "
+"/> "
+"<font id = 'text_button_hover' "
+"file = 'default' "
+"color = 'green2' "
+"/> "
+"<font id = 'text_normal' "
+"file = 'default' "
+"color = 'green' "
+"/> "
+"</fonts> "
+"<defaults fill = 'foreground' fg_color = 'darkgrey' bg_color = 'black' shadow = '0' bevel_color = 'lightgrey'/> "
+"<drawdata id = 'text_selection' cache = false> "
+"<drawstep func = 'square' "
+"fill = 'foreground' "
+"fg_color = 'green' "
+"/> "
+"</drawdata> "
+"<drawdata id = 'mainmenu_bg' cache = false> "
+"<drawstep func = 'fill' "
+"fill = 'foreground' "
+"fg_color = 'black' "
+"/> "
+"</drawdata> "
+"<drawdata id = 'special_bg' cache = false> "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"/> "
+"</drawdata> "
+"<drawdata id = 'separator' cache = false> "
+"<drawstep func = 'square' "
+"fill = 'foreground' "
+"height = '2' "
+"ypos = 'center' "
+"fg_color = 'lightgrey' "
+"/> "
+"</drawdata> "
+"<drawdata id = 'scrollbar_base' cache = false> "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"/> "
+"</drawdata> "
+"<drawdata id = 'scrollbar_handle_hover' cache = false> "
+"<drawstep func = 'square' "
+"fill = 'foreground' "
+"fg_color = 'green2' "
+"/> "
+"</drawdata> "
+"<drawdata id = 'scrollbar_handle_idle' cache = false> "
+"<drawstep func = 'square' "
+"fill = 'foreground' "
+"fg_color = 'green' "
+"/> "
+"</drawdata> "
+"<drawdata id = 'scrollbar_button_idle' cache = false> "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
+"/> "
+"<drawstep func = 'triangle' "
+"fg_color = 'green' "
+"fill = 'foreground' "
+"width = 'auto' "
+"height = 'auto' "
+"xpos = 'center' "
+"ypos = 'center' "
+"orientation = 'top' "
+"/> "
+"</drawdata> "
+"<drawdata id = 'scrollbar_button_hover' cache = false> "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
+"/> "
+"<drawstep func = 'triangle' "
+"fg_color = 'green2' "
+"fill = 'foreground' "
+"width = 'auto' "
+"height = 'auto' "
+"xpos = 'center' "
+"ypos = 'center' "
+"orientation = 'top' "
+"/> "
+"</drawdata> "
+"<drawdata id = 'tab_active' cache = false> "
+"<text font = 'text_hover' "
+"vertical_align = 'center' "
+"horizontal_align = 'center' "
+"/> "
+"<drawstep func = 'tab' "
+"bevel = '2' "
+"radius = '0' "
+"fill = 'none' "
+"/> "
+"</drawdata> "
+"<drawdata id = 'tab_inactive' cache = false> "
+"<text font = 'text_default' "
+"vertical_align = 'center' "
+"horizontal_align = 'center' "
+"/> "
+"<drawstep func = 'tab' "
+"bevel = '2' "
+"radius = '0' "
+"fill = 'none' "
+"/> "
+"</drawdata> "
+"<drawdata id = 'tab_background' cache = false> "
+"</drawdata> "
+"<drawdata id = 'widget_slider' cache = false> "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
+"/> "
+"</drawdata> "
+"<drawdata id = 'slider_disabled' cache = false> "
+"<drawstep func = 'square' "
+"fill = 'foreground' "
+"fg_color = 'lightgrey' "
+"/> "
+"</drawdata> "
+"<drawdata id = 'slider_full' cache = false> "
+"<drawstep func = 'square' "
+"fill = 'foreground' "
+"fg_color = 'green' "
+"/> "
+"</drawdata> "
+"<drawdata id = 'slider_hover' cache = false> "
+"<drawstep func = 'square' "
+"fill = 'foreground' "
+"fg_color = 'green2' "
+"/> "
+"</drawdata> "
+"<drawdata id = 'widget_small' cache = false> "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
+"/> "
+"</drawdata> "
+"<drawdata id = 'popup_idle' cache = false> "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
+"/> "
+"<drawstep func = 'triangle' "
+"fg_color = 'green' "
+"fill = 'foreground' "
+"width = 'height' "
+"height = 'auto' "
+"xpos = 'right' "
+"ypos = 'center' "
+"orientation = 'bottom' "
+"/> "
+"<text font = 'text_default' "
+"vertical_align = 'center' "
+"horizontal_align = 'left' "
+"/> "
+"</drawdata> "
+"<drawdata id = 'popup_hover' cache = false> "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
+"/> "
+"<drawstep func = 'triangle' "
+"fg_color = 'green2' "
+"fill = 'foreground' "
+"width = 'height' "
+"height = 'auto' "
+"xpos = 'right' "
+"ypos = 'center' "
+"orientation = 'bottom' "
+"/> "
+"<text font = 'text_hover' "
+"vertical_align = 'center' "
+"horizontal_align = 'left' "
+"/> "
+"</drawdata> "
+"<drawdata id = 'widget_textedit' cache = false> "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
+"/> "
+"</drawdata> "
+"<drawdata id = 'plain_bg' cache = false> "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"/> "
+"</drawdata> "
+"<drawdata id = 'caret' cache = false> "
+"<drawstep func = 'square' "
+"fill = 'foreground' "
+"fg_color = 'lightgrey' "
+"/> "
+"</drawdata> "
+"<drawdata id = 'default_bg' cache = false> "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"/> "
+"</drawdata> "
+"<drawdata id = 'button_idle' cache = false> "
+"<text font = 'text_button' "
+"vertical_align = 'center' "
+"horizontal_align = 'center' "
+"/> "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
+"/> "
+"</drawdata> "
+"<drawdata id = 'button_hover' cache = false> "
+"<text font = 'text_button_hover' "
+"vertical_align = 'center' "
+"horizontal_align = 'center' "
+"/> "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
+"/> "
+"</drawdata> "
+"<drawdata id = 'button_disabled' cache = false> "
+"<text font = 'text_disabled' "
+"vertical_align = 'center' "
+"horizontal_align = 'center' "
+"/> "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
+"/> "
+"</drawdata> "
+"<drawdata id = 'checkbox_disabled' cache = false> "
+"<text font = 'text_disabled' "
+"vertical_align = 'top' "
+"horizontal_align = 'left' "
+"/> "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
+"/> "
+"</drawdata> "
+"<drawdata id = 'checkbox_selected' cache = false> "
+"<text font = 'text_default' "
+"vertical_align = 'top' "
+"horizontal_align = 'left' "
+"/> "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
+"/> "
+"<drawstep func = 'cross' "
+"fill = 'foreground' "
+"stroke = '2' "
+"fg_color = 'green' "
+"/> "
+"</drawdata> "
+"<drawdata id = 'checkbox_default' cache = false> "
+"<text font = 'text_default' "
+"vertical_align = 'top' "
+"horizontal_align = 'left' "
+"/> "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"fill = 'none' "
+"/> "
+"</drawdata> "
+"<drawdata id = 'widget_default' cache = false> "
+"<drawstep func = 'bevelsq' "
+"bevel = '2' "
+"/> "
+"</drawdata> "
+"</render_info> "
 "<layout_info resolution = '-320xY, -256x240'> "
 "<globals> "
 "<def var = 'Line.Height' value = '16' /> "
@@ -73,7 +379,7 @@
 "height = '20' "
 "/> "
 "</layout> "
-"<space size = '12'/> "
+"<space size = '4'/> "
 "<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'> "
 "<widget name = 'QuitButton' "
 "height = '20' "
@@ -611,312 +917,6 @@
 "</layout> "
 "</dialog> "
 "</layout_info> "
-"<render_info> "
-"<palette> "
-"<color name = 'black' "
-"rgb = '0, 0, 0' "
-"/> "
-"<color name = 'lightgrey' "
-"rgb = '104, 104, 104' "
-"/> "
-"<color name = 'darkgrey' "
-"rgb = '64, 64, 64' "
-"/> "
-"<color name = 'green' "
-"rgb = '32, 160, 32' "
-"/> "
-"<color name = 'green2' "
-"rgb = '0, 255, 0' "
-"/> "
-"</palette> "
-"<fonts> "
-"<font id = 'text_default' "
-"file = 'default' "
-"color = 'green' "
-"/> "
-"<font id = 'text_hover' "
-"file = 'default' "
-"color = 'green2' "
-"/> "
-"<font id = 'text_disabled' "
-"file = 'default' "
-"color = 'lightgrey' "
-"/> "
-"<font id = 'text_inverted' "
-"file = 'default' "
-"color = 'black' "
-"/> "
-"<font id = 'text_button' "
-"file = 'default' "
-"color = 'green' "
-"/> "
-"<font id = 'text_button_hover' "
-"file = 'default' "
-"color = 'green2' "
-"/> "
-"<font id = 'text_normal' "
-"file = 'default' "
-"color = 'green' "
-"/> "
-"</fonts> "
-"<defaults fill = 'foreground' fg_color = 'darkgrey' bg_color = 'black' shadow = '0' bevel_color = 'lightgrey'/> "
-"<drawdata id = 'text_selection' cache = false> "
-"<drawstep func = 'square' "
-"fill = 'foreground' "
-"fg_color = 'green' "
-"/> "
-"</drawdata> "
-"<drawdata id = 'mainmenu_bg' cache = false> "
-"<drawstep func = 'fill' "
-"fill = 'foreground' "
-"fg_color = 'black' "
-"/> "
-"</drawdata> "
-"<drawdata id = 'special_bg' cache = false> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
-"/> "
-"</drawdata> "
-"<drawdata id = 'separator' cache = false> "
-"<drawstep func = 'square' "
-"fill = 'foreground' "
-"height = '2' "
-"ypos = 'center' "
-"fg_color = 'lightgrey' "
-"/> "
-"</drawdata> "
-"<drawdata id = 'scrollbar_base' cache = false> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
-"/> "
-"</drawdata> "
-"<drawdata id = 'scrollbar_handle_hover' cache = false> "
-"<drawstep func = 'square' "
-"fill = 'foreground' "
-"fg_color = 'green2' "
-"/> "
-"</drawdata> "
-"<drawdata id = 'scrollbar_handle_idle' cache = false> "
-"<drawstep func = 'square' "
-"fill = 'foreground' "
-"fg_color = 'green' "
-"/> "
-"</drawdata> "
-"<drawdata id = 'scrollbar_button_idle' cache = false> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
-"fill = 'none' "
-"/> "
-"<drawstep func = 'triangle' "
-"fg_color = 'green' "
-"fill = 'foreground' "
-"width = 'auto' "
-"height = 'auto' "
-"xpos = 'center' "
-"ypos = 'center' "
-"orientation = 'top' "
-"/> "
-"</drawdata> "
-"<drawdata id = 'scrollbar_button_hover' cache = false> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
-"fill = 'none' "
-"/> "
-"<drawstep func = 'triangle' "
-"fg_color = 'green2' "
-"fill = 'foreground' "
-"width = 'auto' "
-"height = 'auto' "
-"xpos = 'center' "
-"ypos = 'center' "
-"orientation = 'top' "
-"/> "
-"</drawdata> "
-"<drawdata id = 'tab_active' cache = false> "
-"<text font = 'text_hover' "
-"vertical_align = 'center' "
-"horizontal_align = 'center' "
-"/> "
-"<drawstep func = 'tab' "
-"bevel = '2' "
-"radius = '0' "
-"fill = 'none' "
-"/> "
-"</drawdata> "
-"<drawdata id = 'tab_inactive' cache = false> "
-"<text font = 'text_default' "
-"vertical_align = 'center' "
-"horizontal_align = 'center' "
-"/> "
-"<drawstep func = 'tab' "
-"bevel = '2' "
-"radius = '0' "
-"fill = 'none' "
-"/> "
-"</drawdata> "
-"<drawdata id = 'tab_background' cache = false> "
-"</drawdata> "
-"<drawdata id = 'widget_slider' cache = false> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
-"fill = 'none' "
-"/> "
-"</drawdata> "
-"<drawdata id = 'slider_disabled' cache = false> "
-"<drawstep func = 'square' "
-"fill = 'foreground' "
-"fg_color = 'lightgrey' "
-"/> "
-"</drawdata> "
-"<drawdata id = 'slider_full' cache = false> "
-"<drawstep func = 'square' "
-"fill = 'foreground' "
-"fg_color = 'green' "
-"/> "
-"</drawdata> "
-"<drawdata id = 'slider_hover' cache = false> "
-"<drawstep func = 'square' "
-"fill = 'foreground' "
-"fg_color = 'green2' "
-"/> "
-"</drawdata> "
-"<drawdata id = 'widget_small' cache = false> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
-"fill = 'none' "
-"/> "
-"</drawdata> "
-"<drawdata id = 'popup_idle' cache = false> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
-"fill = 'none' "
-"/> "
-"<drawstep func = 'triangle' "
-"fg_color = 'green' "
-"fill = 'foreground' "
-"width = 'height' "
-"height = 'auto' "
-"xpos = 'right' "
-"ypos = 'center' "
-"orientation = 'bottom' "
-"/> "
-"<text font = 'text_default' "
-"vertical_align = 'center' "
-"horizontal_align = 'left' "
-"/> "
-"</drawdata> "
-"<drawdata id = 'popup_hover' cache = false> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
-"fill = 'none' "
-"/> "
-"<drawstep func = 'triangle' "
-"fg_color = 'green2' "
-"fill = 'foreground' "
-"width = 'height' "
-"height = 'auto' "
-"xpos = 'right' "
-"ypos = 'center' "
-"orientation = 'bottom' "
-"/> "
-"<text font = 'text_hover' "
-"vertical_align = 'center' "
-"horizontal_align = 'left' "
-"/> "
-"</drawdata> "
-"<drawdata id = 'widget_textedit' cache = false> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
-"fill = 'none' "
-"/> "
-"</drawdata> "
-"<drawdata id = 'plain_bg' cache = false> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
-"/> "
-"</drawdata> "
-"<drawdata id = 'caret' cache = false> "
-"<drawstep func = 'square' "
-"fill = 'foreground' "
-"fg_color = 'lightgrey' "
-"/> "
-"</drawdata> "
-"<drawdata id = 'default_bg' cache = false> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
-"/> "
-"</drawdata> "
-"<drawdata id = 'button_idle' cache = false> "
-"<text font = 'text_button' "
-"vertical_align = 'center' "
-"horizontal_align = 'center' "
-"/> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
-"fill = 'none' "
-"/> "
-"</drawdata> "
-"<drawdata id = 'button_hover' cache = false> "
-"<text font = 'text_button_hover' "
-"vertical_align = 'center' "
-"horizontal_align = 'center' "
-"/> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
-"fill = 'none' "
-"/> "
-"</drawdata> "
-"<drawdata id = 'button_disabled' cache = false> "
-"<text font = 'text_disabled' "
-"vertical_align = 'center' "
-"horizontal_align = 'center' "
-"/> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
-"fill = 'none' "
-"/> "
-"</drawdata> "
-"<drawdata id = 'checkbox_disabled' cache = false> "
-"<text font = 'text_disabled' "
-"vertical_align = 'top' "
-"horizontal_align = 'left' "
-"/> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
-"fill = 'none' "
-"/> "
-"</drawdata> "
-"<drawdata id = 'checkbox_selected' cache = false> "
-"<text font = 'text_default' "
-"vertical_align = 'top' "
-"horizontal_align = 'left' "
-"/> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
-"fill = 'none' "
-"/> "
-"<drawstep func = 'cross' "
-"fill = 'foreground' "
-"stroke = '2' "
-"fg_color = 'green' "
-"/> "
-"</drawdata> "
-"<drawdata id = 'checkbox_default' cache = false> "
-"<text font = 'text_default' "
-"vertical_align = 'top' "
-"horizontal_align = 'left' "
-"/> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
-"fill = 'none' "
-"/> "
-"</drawdata> "
-"<drawdata id = 'widget_default' cache = false> "
-"<drawstep func = 'bevelsq' "
-"bevel = '2' "
-"/> "
-"</drawdata> "
-"</render_info> "
 "<layout_info resolution = '320xY, 256x240'> "
 "<globals> "
 "<def var = 'Line.Height' value = '12' /> "
@@ -948,7 +948,7 @@
 "size = '-1, Globals.Line.Height' "
 "/> "
 "<widget name = 'ListWidget' "
-"padding = '5, 0, 8, 0' "
+"padding = '5, 0, 0, 0' "
 "/> "
 "<widget name = 'PopUpWidget' "
 "padding = '7, 5, 0, 0' "
@@ -988,7 +988,6 @@
 "height = '12' "
 "/> "
 "</layout> "
-"<space size = '4'/> "
 "<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'> "
 "<widget name = 'QuitButton' "
 "height = '12' "
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 9278727cb3..afc545f335 100644
--- a/gui/themes/scummclassic.zip
+++ b/gui/themes/scummclassic.zip
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index c663c16853..888d34ba3b 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -105,7 +105,7 @@
 						height = '20'
 				/>
 			</layout>
-			<space size = '12'/>
+			<space size = '4'/>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>
 				<widget name = 'QuitButton' 
 						height = '20'
diff --git a/gui/themes/scummclassic/classic_layout_320.stx b/gui/themes/scummclassic/classic_layout_320.stx
index 921e3ff5eb..7304adb15e 100644
--- a/gui/themes/scummclassic/classic_layout_320.stx
+++ b/gui/themes/scummclassic/classic_layout_320.stx
@@ -60,7 +60,7 @@
 				size = '-1, Globals.Line.Height'
 		/>
 		<widget name = 'ListWidget'
-				padding = '5, 0, 8, 0'
+				padding = '5, 0, 0, 0'
 		/>
 		<widget name = 'PopUpWidget'
 				padding = '7, 5, 0, 0'
@@ -101,7 +101,6 @@
 						height = '12'
 				/>
 			</layout>
-			<space size = '4'/>
 			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>
 				<widget name = 'QuitButton' 
 						height = '12'
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 8e2cb0be67..b62aa2c9f3 100644
--- a/gui/themes/scummmodern.zip
+++ b/gui/themes/scummmodern.zip