Allow the disabled state of the popup widget to be themed

svn-id: r35480

gui/ThemeData.cpp

@@ -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},

gui/ThemeEngine.cpp

@@ -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);
 

gui/ThemeEngine.h

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

gui/themes/default.inc

@@ -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' "

gui/themes/scummclassic/classic_gfx.stx

@@ -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'

gui/themes/scummmodern/scummmodern_gfx.stx

@@ -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'