Major GUI update:

- Implemented padding in console
- Update only current line in console instead of whole screen
- Fixed caret positioning in edit text widget
- Improved buttons drawing, now they look more realistic
- Added label spacing in popup widget
- Correct shadow in popup widget
- Fixed up with selected popup widget being drawn on wrong tab
- Added shading to list dialog
- Adjusted shading of inactive widgets
- Proper coloring of browset (add game) dialog
- Introduced Container widget
- Used Container widget in scumm save/load dialog. Now it looks properly
- Adjusted button colors even more. Now they match almost perfectly albeit with banding
- Made scrollbar appear only when it is really needed

svn-id: r22670

1 files changed, 26 insertions, 18 deletions

diff --git a/gui/themes/modern.ini b/gui/themes/modern.ini
index dae955cf11..cdc0b2edc1 100644
--- a/gui/themes/modern.ini
+++ b/gui/themes/modern.ini
@@ -1,7 +1,7 @@
 # $URL$
 # $Id$
 [theme]
-version=12
+version=13
 
 [pixmaps]
 dialog_corner=dialog_bkgd_corner.bmp
@@ -75,7 +75,7 @@ main_dialog_end=239 196 24
 dialog_start=246 224 139
 dialog_end=251 241 206
 
-color_state_disabled=128 128 128
+color_state_disabled=192 192 192
 color_state_highlight=100 162 8
 color_state_enabled=0 0 0
 
@@ -89,18 +89,18 @@ widget_bkgd_end=251 241 206
 widget_bkgd_small_start=246 224 139
 widget_bkgd_small_end=251 241 206
 
-button_bkgd_start=210 130 110
-button_bkgd_end=177 61 34
+button_bkgd_start=203 126 107
+button_bkgd_end=169 42 12
 button_bkgd_highlight_start=255 210 200
 button_bkgd_highlight_end=200 70 50
 button_text_enabled=255 255 255
-button_text_disabled=128 128 128
+button_text_disabled=192 192 192
 button_text_highlight=255 214 84
 
 slider_background_start=247 228 166
 slider_background_end=247 228 166
-slider_start=210 130 110
-slider_end=177 61 34
+slider_start=203 126 107
+slider_end=169 42 12
 slider_highlight_start=255 210 200
 slider_highlight_end=200 70 50
 
@@ -111,8 +111,8 @@ scrollbar_background_start=247 228 166
 scrollbar_background_end=247 228 166
 scrollbar_button_start=247 228 166
 scrollbar_button_end=247 228 166
-scrollbar_slider_start=210 130 110
-scrollbar_slider_end=177 61 34
+scrollbar_slider_start=203 126 107
+scrollbar_slider_end=169 42 12
 scrollbar_button_highlight_start=255 210 200
 scrollbar_button_highlight_end=200 70 50
 scrollbar_slider_highlight_start=255 210 200
@@ -137,9 +137,9 @@ dialog_special=2
 widget_small=3
 widget=3
 
-button=2
+button=1
 
-slider=2
+slider=1
 slider_bkgd=1
 
 tab=2
@@ -157,7 +157,7 @@ shadow_right_width=4
 shadow_top_height=2
 shadow_bottom_height=4
 inactive_dialog_shading=dim
-shading_dim_percent=20
+shading_dim_percent=15
 fontfile_normal=helvr12-l1.bdf
 fontfile_fixed_normal=courr12-l1.bdf
 cursor_hotspot_x=0
@@ -192,16 +192,22 @@ def_midiControlsSpacing=4
 
 ##### Widgets config
 ListWidget.leftPadding=7
-ListWidget.rightPadding=7
+ListWidget.rightPadding=5
 ListWidget.topPadding=5
 ListWidget.bottomPadding=5
 ListWidget.hlLeftPadding=0
 ListWidget.hlRightPadding=0
 PopUpWidget.leftPadding=7
-PopUpWidget.rightPadding=7
+PopUpWidget.rightPadding=5
+PopUpWidget.labelSpacing=3
+EditTextWidget.font=kFontStyleNormal
 EditTextWidget.leftPadding=7
-EditTextWidget.rightPadding=7
+EditTextWidget.rightPadding=5
 Console.font=kFontStyleFixedNormal
+Console.leftPadding=7
+Console.rightPadding=5
+Console.topPadding=5
+Console.bottomPadding=5
 
 ###### chooser
 opHeight=insetH
@@ -393,10 +399,12 @@ scummhelp_close=(scummhelpW - 8 - shButtonWidth) prev.y prev.w prev.h
 # Saveload dialog
 scummsaveload=8 8 (w - 2 * 8) (h - 16)
 set_parent=scummsaveload
-scummsaveload_title=10 2 (parent.w - 2 * 10 - 180) kLineHeight
+scummsaveload_title=10 2 (parent.w - 2 * 10 - 180-20) kLineHeight
 scummsaveload_title.align=kTextAlignCenter
 scummsaveload_list=10 18 prev.w (parent.h - 17 - buttonHeight - 8 - self.y)
 scummsaveload_thumbnail=(parent.w - (kThumbnailWidth + 22)) 18
+scummsaveload_thumbnail.hPad=10
+scummsaveload_thumbnail.vPad=10
 scummsaveload_cancel=(parent.w - 2 * (buttonWidth + 10)) (parent.h - buttonHeight - 8) buttonWidth buttonHeight
 scummsaveload_choose=(prev.x2 + 10) prev.y prev.w prev.h
 scummsaveload_extinfo.visible=true
@@ -414,9 +422,9 @@ chooser_ok=(prev.x2 + 10) prev.y prev.w prev.h
 gcx=(opXoffset + 10)
 gcw=(parent.w - gcx - 25)
 grModePopup=(gcx - 5) (opYoffset - 1) (gcw + 5) kPopUpHeight
-opYoffset=(opYoffset + kLineHeight + 8)
-grRenderPopup=prev.x (opYoffset - 1) prev.w prev.h
 opYoffset=(opYoffset + kLineHeight + 12)
+grRenderPopup=prev.x (opYoffset - 1) prev.w prev.h
+opYoffset=(opYoffset + kLineHeight + 16)
 grFullscreenCheckbox=gcx opYoffset (kFontHeight + 10 + 96) buttonHeight
 opYoffset=(opYoffset + buttonHeight + 4)
 grAspectCheckbox=prev.x opYoffset (kFontHeight + 10 + 136) prev.h