thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow the disabled state of the popup widget to be themed

Browse source 
svn-id: r35480
This commit is contained in:
Jordi Vilalta Prat 2008-12-22 10:31:01 +00:00
parent 1ccce41c8f
commit 2ec51ef358
8 changed files with 72 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gui/ThemeData.cpp
View file

@ -78,6 +78,7 @@ const ThemeEngine::DrawDataInfo ThemeEngine::kDrawDataDefaults[] = {
{kDDPopUpIdle, "popup_idle", true, kDDNone},
{kDDPopUpHover, "popup_hover", false, kDDPopUpIdle},
{kDDPopUpDisabled, "popup_disabled", true, kDDNone},
{kDDCaret, "caret", false, kDDNone},
{kDDSeparator, "separator", true, kDDNone},

9
gui/ThemeEngine.cpp
View file

@ -774,7 +774,14 @@ void ThemeEngine::drawPopUpWidget(const Common::Rect &r, const Common::String &s
if (!ready())
return;
DrawData dd = (state == kStateHighlight) ? kDDPopUpHover : kDDPopUpIdle;
DrawData dd = kDDPopUpIdle;
if (state == kStateEnabled)
dd = kDDPopUpIdle;
else if (state == kStateHighlight)
dd = kDDPopUpHover;
else if (state == kStateDisabled)
dd = kDDPopUpDisabled;
queueDD(dd, r);

1
gui/ThemeEngine.h
View file

@ -101,6 +101,7 @@ protected:
kDDPopUpIdle,
kDDPopUpHover,
kDDPopUpDisabled,
kDDCaret,
kDDSeparator,

19
gui/themes/default.inc
View file

@ -193,6 +193,25 @@
"horizontal_align='left' "
"/> "
"</drawdata> "
"<drawdata id='popup_disabled' cache='false'> "
"<drawstep func='bevelsq' "
"bevel='2' "
"fill='none' "
"/> "
"<drawstep func='triangle' "
"fg_color='lightgrey' "
"fill='foreground' "
"width='height' "
"height='auto' "
"xpos='right' "
"ypos='center' "
"orientation='bottom' "
"/> "
"<text font='text_disabled' "
"vertical_align='center' "
"horizontal_align='left' "
"/> "
"</drawdata> "
"<drawdata id='popup_hover' cache='false'> "
"<drawstep func='bevelsq' "
"bevel='2' "

BIN
gui/themes/scummclassic.zip
View file

Binary file not shown.

21
gui/themes/scummclassic/classic_gfx.stx
View file

@ -238,6 +238,25 @@
/>
</drawdata>
<drawdata id = 'popup_disabled' cache = 'false'>
<drawstep func = 'bevelsq'
bevel = '2'
fill = 'none'
/>
<drawstep func = 'triangle'
fg_color = 'lightgrey'
fill = 'foreground'
width = 'height'
height = 'auto'
xpos = 'right'
ypos = 'center'
orientation = 'bottom'
/>
<text font = 'text_disabled'
vertical_align = 'center'
horizontal_align = 'left'
/>
</drawdata>
<drawdata id = 'popup_hover' cache = 'false'>
<drawstep func = 'bevelsq'
@ -361,4 +380,4 @@
bevel = '2'
/>
</drawdata>
</render_info>
</render_info>

BIN
gui/themes/scummmodern.zip
View file

Binary file not shown.

24
gui/themes/scummmodern/scummmodern_gfx.stx
View file

@ -306,6 +306,28 @@
/>
</drawdata>
<drawdata id = 'popup_disabled' cache = 'false'>
<drawstep func = 'roundedsq'
stroke = '0'
radius = '4'
fill = 'foreground'
fg_color = '250, 237, 190'
shadow = '2'
/>
<drawstep func = 'triangle'
fg_color = '63, 60, 52'
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 = 'roundedsq'
@ -486,4 +508,4 @@
shadow = '3'
/>
</drawdata>
</render_info>
</render_info>