X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/549ed3c87c4d3fe093472aa199ca6742c1f3654f..7fb088ec04db7eb68ff7294393f53ba33f533655:/lib/gui/ewindowstyle.cpp

diff --git a/lib/gui/ewindowstyle.cpp b/lib/gui/ewindowstyle.cpp
index 86ff8a42..0ecdc2a2 100644
--- a/lib/gui/ewindowstyle.cpp
+++ b/lib/gui/ewindowstyle.cpp
@@ -9,6 +9,13 @@ eWindowStyle::~eWindowStyle() {}
 
 DEFINE_REF(eWindowStyleManager);
 
+ePtr<eWindowStyleManager> NewWindowStylePtr(void)
+{
+	ePtr<eWindowStyleManager> ptr;
+	eWindowStyleManager::getInstance(ptr);
+	return ptr;
+}
+
 eWindowStyleManager::eWindowStyleManager()
 {
 	m_instance = this;
@@ -19,14 +26,16 @@ eWindowStyleManager::~eWindowStyleManager()
 	m_instance = 0;
 }
 
-void eWindowStyleManager::getStyle(ePtr<eWindowStyle> &style)
+void eWindowStyleManager::getStyle(int style_id, ePtr<eWindowStyle> &style)
 {
-	style = m_current_style;
+	std::map<int, ePtr<eWindowStyle> >::iterator it = m_current_style.find(style_id);
+	ASSERT(it != m_current_style.end());
+	style = it->second;
 }
 
-void eWindowStyleManager::setStyle(eWindowStyle *style)
+void eWindowStyleManager::setStyle(int style_id, eWindowStyle *style)
 {
-	m_current_style = style;
+	m_current_style[style_id] = style;
 }
 
 eWindowStyleManager *eWindowStyleManager::m_instance;
@@ -109,6 +118,10 @@ void eWindowStyleSimple::setStyle(gPainter &painter, int what)
 		painter.setForegroundColor(gColor(0x2F));
 		painter.setBackgroundColor(gColor(0x2A));
 		break;
+	case styleListboxMarkedAndSelected:
+		painter.setForegroundColor(gColor(0x3F));
+		painter.setBackgroundColor(gColor(0x3A));
+		break;
 	}
 }