add special color for marked and selected

diff --git a/data/skin.xml b/data/skin.xml
index 50646655d08d23ce3b618be04ae25762f036c1f5..689856300b31720452720dc2e7486445a6bce1dc 100644 (file)
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -21,6 +21,8 @@
                        <color name="ListboxSelectedForeground" color="#ffffff" />
                        <color name="ListboxMarkedBackground" color="#ff0000" />
                        <color name="ListboxMarkedForeground" color="#ffffff" />
+                       <color name="ListboxMarkedAndSelectedBackground" color="#800000" />
+                       <color name="ListboxMarkedAndSelectedForeground" color="#ffffff" />
                        <color name="WindowTitleForeground" color="#ffffff" />
                        <color name="WindowTitleBackground" color="#33294a6b" />
                        <borderset name="bsWindow">

diff --git a/lib/gui/ewindowstyle.cpp b/lib/gui/ewindowstyle.cpp
index 86ff8a4267919783f8cacfca82107db6cf0d33d0..4cfaa8d4c6637bd72fbc11803dafba202ed49bb8 100644 (file)
--- a/lib/gui/ewindowstyle.cpp
+++ b/lib/gui/ewindowstyle.cpp
@@ -109,6 +109,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;
        }
 }
 

diff --git a/lib/gui/ewindowstyle.h b/lib/gui/ewindowstyle.h
index 04d9d44ae3c481d955de4110b98717107b4caa76..3c9c805b92ef713ef4a4dabdbaca3f0b46d7b47b 100644 (file)
--- a/lib/gui/ewindowstyle.h
+++ b/lib/gui/ewindowstyle.h
@@ -18,7 +18,8 @@ public:
                styleLabel,
                styleListboxSelected,
                styleListboxNormal,
-               styleListboxMarked
+               styleListboxMarked,
+               styleListboxMarkedAndSelected
        };
        
        virtual void drawFrame(gPainter &painter, const eRect &frame, int type) = 0;

diff --git a/lib/gui/ewindowstyleskinned.cpp b/lib/gui/ewindowstyleskinned.cpp
index 5da4696e3006d31527f53e9ec38552aaa7bda1ae..a3cc3c5f1d7aab1a66f33d07b128e78acf38410c 100644 (file)
--- a/lib/gui/ewindowstyleskinned.cpp
+++ b/lib/gui/ewindowstyleskinned.cpp
@@ -70,6 +70,10 @@ void eWindowStyleSkinned::setStyle(gPainter &painter, int what)
                painter.setForegroundColor(m_color[colListboxMarkedForeground]);
                painter.setBackgroundColor(m_color[colListboxMarkedBackground]);
                break;
+       case styleListboxMarkedAndSelected:
+               painter.setForegroundColor(m_color[colListboxMarkedAndSelectedForeground]);
+               painter.setBackgroundColor(m_color[colListboxMarkedAndSelectedBackground]);
+               break;
        }
 }
 

diff --git a/lib/gui/ewindowstyleskinned.h b/lib/gui/ewindowstyleskinned.h
index 17988f65192632514fba666b00d6d801d56534c1..1c16a7b516ca22241d3f139e6441ae7fa0641c7a 100644 (file)
--- a/lib/gui/ewindowstyleskinned.h
+++ b/lib/gui/ewindowstyleskinned.h
@@ -61,6 +61,8 @@ public:
                colListboxSelectedForeground,
                colListboxMarkedBackground,
                colListboxMarkedForeground,
+               colListboxMarkedAndSelectedBackground,
+               colListboxMarkedAndSelectedForeground,
                
                colWindowTitleForeground,
                colWindowTitleBackground,

diff --git a/lib/service/listboxservice.cpp b/lib/service/listboxservice.cpp
index 13538e992ccb5a4d830eb715d776f57ca4f02538..c869b49c3fb31eb47225631162ed70e89ebc1edb 100644 (file)
--- a/lib/service/listboxservice.cpp
+++ b/lib/service/listboxservice.cpp
@@ -358,7 +358,7 @@ void eListboxServiceContent::paint(gPainter &painter, eWindowStyle &style, const
        if (m_current_marked && selected)
                style.setStyle(painter, eWindowStyle::styleListboxMarked);
        else if (cursorValid() && isMarked(*m_cursor))
-               style.setStyle(painter, eWindowStyle::styleListboxMarked);
+               style.setStyle(painter, selected ? eWindowStyle::styleListboxMarkedAndSelected : eWindowStyle::styleListboxMarked);
        else
                style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
        painter.clear();