8 files changed, 72 insertions, 3 deletions

diff --git a/gui/ThemeData.cpp b/gui/ThemeData.cpp
index 13750f432c..d1593a0642 100644
--- a/gui/ThemeData.cpp
+++ b/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},
diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index 11b960a91b..839f351aa7 100644
--- a/gui/ThemeEngine.cpp
+++ b/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);
 
diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h
index 7115ec1a76..43f2a8c8eb 100644
--- a/gui/ThemeEngine.h
+++ b/gui/ThemeEngine.h
@@ -101,6 +101,7 @@ protected:
 
 		kDDPopUpIdle,
 		kDDPopUpHover,
+		kDDPopUpDisabled,
 
 		kDDCaret,
 		kDDSeparator,
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 986d832bd9..144e019a9b 100644
--- a/gui/themes/default.inc
+++ b/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' "
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 377aeb2265..d82bb8e399 100644
--- a/gui/themes/scummclassic.zip
+++ b/gui/themes/scummclassic.zip
diff --git a/gui/themes/scummclassic/classic_gfx.stx b/gui/themes/scummclassic/classic_gfx.stx
index cbf8f8f448..911ef585aa 100644
--- a/gui/themes/scummclassic/classic_gfx.stx
+++ b/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'
@@ -361,4 +380,4 @@
 					bevel = '2'
 		/>
 	</drawdata>
-</render_info>
\ No newline at end of file
+</render_info>
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 4e18963deb..26945f091b 100644
--- a/gui/themes/scummmodern.zip
+++ b/gui/themes/scummmodern.zip
diff --git a/gui/themes/scummmodern/scummmodern_gfx.stx b/gui/themes/scummmodern/scummmodern_gfx.stx
index 48d01d38f4..16688a34d2 100644
--- a/gui/themes/scummmodern/scummmodern_gfx.stx
+++ b/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'
@@ -486,4 +508,4 @@
 					shadow = '3'
 		/>
 	</drawdata>
-</render_info>
\ No newline at end of file
+</render_info>