From f7b207ada21b9aa2cc984afbcae3c8f36150f999 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 5 May 2020 12:05:53 +0300
Subject: =?UTF-8?q?fixes=20#2389=20(NewStory:=20=D0=BD=D0=B5=D0=B2=D0=BE?=
 =?UTF-8?q?=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=20=D0=BD=D0=B0=D1=81=D1=82?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B8=D1=82=D1=8C=20=D1=86=D0=B2=D0=B5=D1=82=20?=
 =?UTF-8?q?=D0=B2=D1=8B=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD=D0=BD=D1=8B=D1=85=20?=
 =?UTF-8?q?=D1=8D=D0=BB=D0=B5=D0=BC=D0=B5=D0=BD=D1=82=D0=BE=D0=B2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/NewStory/src/fonts.cpp           |  6 ++++--
 plugins/NewStory/src/fonts.h             | 14 +++++---------
 plugins/NewStory/src/history_control.cpp |  6 +++---
 3 files changed, 12 insertions(+), 14 deletions(-)

(limited to 'plugins')

diff --git a/plugins/NewStory/src/fonts.cpp b/plugins/NewStory/src/fonts.cpp
index b7c4a4af55..122a6de30b 100644
--- a/plugins/NewStory/src/fonts.cpp
+++ b/plugins/NewStory/src/fonts.cpp
@@ -13,10 +13,12 @@ MyColourID g_colorTable[COLOR_COUNT] =
 	{ LPGEN("Other incoming events"), "ColorIn",      RGB(0xff, 0xff, 0xff) },
 	{ LPGEN("Other outgoing events"), "ColorOut",     RGB(0xff, 0xff, 0xff) },
 
-	{ LPGEN("Selected items"),        "ColorSel",     RGB(0x60, 0x60, 0x60) },
-	{ LPGEN("Selected items (text)"), "ColorSelTxt",  RGB(0xff, 0xff, 0xff) },
+	{ LPGEN("Selected item's text"),  "ColorSelTxt",  RGB(0xff, 0xff, 0xff) },
+	{ LPGEN("Selected item's back"),  "ColorSel",     GetSysColor(COLOR_HIGHLIGHT) },
+	{ LPGEN("Selected item's frame"), "ColorSelFrm",  GetSysColor(COLOR_HIGHLIGHTTEXT) },
 
 	{ LPGEN("Background"),            "Background",   RGB(0xff, 0xff, 0xff) },
+	{ LPGEN("Separator"),             "Separator",    RGB(0x60, 0x60, 0x60) },
 };
 
 MyFontID g_fontTable[FONT_COUNT] =
diff --git a/plugins/NewStory/src/fonts.h b/plugins/NewStory/src/fonts.h
index 36f7c352ef..6707639d16 100644
--- a/plugins/NewStory/src/fonts.h
+++ b/plugins/NewStory/src/fonts.h
@@ -5,16 +5,12 @@
 
 enum
 {
-	COLOR_INMSG,
-	COLOR_OUTMSG,
-	COLOR_INFILE,
-	COLOR_OUTFILE,
-	COLOR_INOTHER,
-	COLOR_OUTOTHER,
+	COLOR_INMSG, COLOR_OUTMSG,
+	COLOR_INFILE, COLOR_OUTFILE,
 	COLOR_STATUS,
-	COLOR_SELECTED,
-	COLOR_SELTEXT,
-	COLOR_BACK,
+	COLOR_INOTHER, COLOR_OUTOTHER,
+	COLOR_SELTEXT, COLOR_SELBACK, COLOR_SELFRAME,
+	COLOR_BACK, COLOR_FRAME,
 	COLOR_COUNT
 };
 
diff --git a/plugins/NewStory/src/history_control.cpp b/plugins/NewStory/src/history_control.cpp
index 0289b9fce0..e91671c1f8 100644
--- a/plugins/NewStory/src/history_control.cpp
+++ b/plugins/NewStory/src/history_control.cpp
@@ -366,12 +366,12 @@ struct NewstoryListData : public MZeroedObject
 		if (item->bSelected) {
 			MTextSendMessage(0, item->data, EM_SETSEL, 0, -1);
 			clText = g_colorTable[COLOR_SELTEXT].cl;
-			clLine = GetSysColor(COLOR_HIGHLIGHTTEXT);
-			clBack = GetSysColor(COLOR_HIGHLIGHT);
+			clBack = g_colorTable[COLOR_SELBACK].cl;
+			clLine = g_colorTable[COLOR_SELFRAME].cl;
 		}
 		else {
 			MTextSendMessage(0, item->data, EM_SETSEL, 0, 0);
-			clLine = g_colorTable[COLOR_SELECTED].cl;
+			clLine = g_colorTable[COLOR_FRAME].cl;
 			clBack = g_colorTable[colorid].cl;
 		}
 
-- 
cgit v1.2.3