Fix drawing of tab widget. Now it matches mock-ups. Added tab scrolling.

svn-id: r23116

1 files changed, 20 insertions, 13 deletions

diff --git a/gui/themes/modern.ini b/gui/themes/modern.ini
index 4531fb3605..cc0e26b5da 100644
--- a/gui/themes/modern.ini
+++ b/gui/themes/modern.ini
@@ -1,7 +1,7 @@
 # $URL$
 # $Id$
 [theme]
-version=16
+version=17
 
 [pixmaps]
 pix_dialog_corner="dialog_bkgd_corner.bmp"
@@ -24,10 +24,10 @@ pix_checkbox_checked="checkbox_checked.bmp"
 
 pix_widget_arrow="widget_arrow.bmp"
 
-pix_tab_corner="tab_bkgd_corner.bmp"
-pix_tab_top="button_bkgd_top.bmp"
-pix_tab_left="button_bkgd_left.bmp"
-pix_tab_bkgd="button_bkgd.bmp"
+pix_tab_corner="button_bkgd_corner.bmp"
+pix_tab_top="widget_bkgd_top.bmp"
+pix_tab_left="widget_bkgd_left.bmp"
+pix_tab_bkgd="widget_bkgd.bmp"
 
 pix_slider_bkgd_corner="button_bkgd_corner.bmp"
 pix_slider_bkgd_top="button_bkgd_top.bmp"
@@ -104,13 +104,13 @@ slider_end=169 42 12
 slider_highlight_start=255 210 200
 slider_highlight_end=200 70 50
 
-tab_background_start=246 224 139
-tab_background_end=249 238 190
+tab_background_start=232 180 80
+tab_background_end=232 180 80
 
 tab_active_start=246 224 139
-tab_active_end=249 238 190
-tab_inactive_start=246 224 139
-tab_inactive_end=246 224 139
+tab_active_end=251 241 206
+tab_inactive_start=239 202 109
+tab_inactive_end=239 202 109
 
 scrollbar_background_start=247 228 166
 scrollbar_background_end=247 228 166
@@ -135,7 +135,7 @@ caret_color=0 0 0
 
 [gradients]
 gradient_dialog_main=1
-gradient_dialog=1
+gradient_dialog=2
 gradient_dialog_special=2
 
 gradient_widget_small=3
@@ -221,6 +221,13 @@ Console.leftPadding=7
 Console.rightPadding=5
 Console.topPadding=5
 Console.bottomPadding=5
+TabWidget.tabWidth=100
+TabWidget.tabHeight=27
+TabWidget.titleVPad=8
+TabWidget.navButtonRightPad=3
+TabWidget.navButtonTopPad=4
+TabWidget.navButtonW=15
+TabWidget.navButtonH=18
 
 ###### chooser
 opHeight=insetH
@@ -259,7 +266,7 @@ use=scummmain
 globaloptions=insetX insetY insetW insetH
 set_parent=globaloptions
 vBorder=optionsVPad
-globaloptions_tabwidget=0 vBorder parent.w (parent.h - buttonHeight - 8 - 2 * vBorder)
+globaloptions_tabwidget=0 0 parent.w (parent.h - buttonHeight - 8 - 2 * vBorder)
 
 # graphics tab
 opYoffset=vBorder
@@ -300,7 +307,7 @@ vBorder=gameOptionsOverrideVPad
 gox=10
 gow=(parent.w - gox - 25)
 
-gameoptions_tabwidget=0 vBorder parent.w (parent.h - buttonHeight - 8 - 2 * vBorder)
+gameoptions_tabwidget=0 0 parent.w (parent.h - buttonHeight - 8 - 2 * vBorder)
 
 # game tab
 opYoffset=optionsVPad