From 5ce193303b8b2927e6741331f1266f0fe80962ff Mon Sep 17 00:00:00 2001
From: Andrzej Rybczak <electricityispower@gmail.com>
Date: Wed, 3 Sep 2014 21:27:43 +0200
Subject: [PATCH] fix color of window separators in media library etc.

---
 src/media_library.cpp   |  4 ++--
 src/ncmpcpp.cpp         |  3 ---
 src/playlist_editor.cpp |  2 +-
 src/screen.cpp          | 10 +++-------
 src/screen.h            |  1 +
 src/status.cpp          |  2 +-
 src/tag_editor.cpp      |  4 ++--
 7 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/media_library.cpp b/src/media_library.cpp
index 5f11f9fe..59a43555 100644
--- a/src/media_library.cpp
+++ b/src/media_library.cpp
@@ -226,9 +226,9 @@ void MediaLibrary::resize()
 void MediaLibrary::refresh()
 {
 	Tags.display();
-	mvvline(MainStartY, itsMiddleColStartX-1, 0, MainHeight);
+	drawSeparator(itsMiddleColStartX-1);
 	Albums.display();
-	mvvline(MainStartY, itsRightColStartX-1, 0, MainHeight);
+	drawSeparator(itsRightColStartX-1);
 	Songs.display();
 	if (Albums.empty())
 	{
diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp
index 7c4d2180..b5ef74c7 100644
--- a/src/ncmpcpp.cpp
+++ b/src/ncmpcpp.cpp
@@ -115,9 +115,6 @@ int main(int argc, char **argv)
 	NC::initScreen("ncmpcpp ver. " VERSION, Config.colors_enabled);
 	
 	Actions::OriginalStatusbarVisibility = Config.statusbar_visibility;
-	
-	// for column separators
-	attron(COLOR_PAIR(int(Config.main_color)));
 
 	if (Config.design == Design::Alternative)
 		Config.statusbar_visibility = 0;
diff --git a/src/playlist_editor.cpp b/src/playlist_editor.cpp
index 61c40b3f..455adbff 100644
--- a/src/playlist_editor.cpp
+++ b/src/playlist_editor.cpp
@@ -121,7 +121,7 @@ std::wstring PlaylistEditor::title()
 void PlaylistEditor::refresh()
 {
 	Playlists.display();
-	mvvline(MainStartY, RightColumnStartX-1, 0, MainHeight);
+	drawSeparator(RightColumnStartX-1);
 	Content.display();
 }
 
diff --git a/src/screen.cpp b/src/screen.cpp
index 1150ed60..36c82930 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -28,9 +28,7 @@ using Global::myScreen;
 using Global::myLockedScreen;
 using Global::myInactiveScreen;
 
-namespace {//
-
-void drawScreenSeparator(int x)
+void drawSeparator(int x)
 {
 	attron(COLOR_PAIR(int(Config.main_color)));
 	mvvline(Global::MainStartY, x, 0, Global::MainHeight);
@@ -38,8 +36,6 @@ void drawScreenSeparator(int x)
 	refresh();
 }
 
-}
-
 void genericMouseButtonPressed(NC::Window &w, MEVENT me)
 {
 	if (me.bstate & BUTTON2_PRESSED)
@@ -94,7 +90,7 @@ void BaseScreen::getWindowResizeParams(size_t &x_offset, size_t &width, bool adj
 			{
 				myLockedScreen->resize();
 				myLockedScreen->refresh();
-				drawScreenSeparator(x_offset-1);
+				drawSeparator(x_offset-1);
 			}
 		}
 	}
@@ -153,7 +149,7 @@ void updateInactiveScreen(BaseScreen *screen_to_be_set)
 		// as in "else" case. we also need to refresh it and redraw separator between
 		// them as stacked screen probably has overwritten part ot it.
 		myInactiveScreen->refresh();
-		drawScreenSeparator(COLS*Config.locked_screen_width_part);
+		drawSeparator(COLS*Config.locked_screen_width_part);
 	}
 	else
 	{
diff --git a/src/screen.h b/src/screen.h
index 758ce6bc..a958d539 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -25,6 +25,7 @@
 #include "scrollpad.h"
 #include "screen_type.h"
 
+void drawSeparator(int x);
 void genericMouseButtonPressed(NC::Window &w, MEVENT me);
 void scrollpadMouseButtonPressed(NC::Scrollpad &w, MEVENT me);
 
diff --git a/src/status.cpp b/src/status.cpp
index 3af709b9..1762f5d1 100644
--- a/src/status.cpp
+++ b/src/status.cpp
@@ -567,7 +567,7 @@ void Status::Changes::flags()
 				attron(COLOR_PAIR(int(Config.state_line_color)));
 				mvprintw(1, COLS-2, "]");
 			}
-			attrset(COLOR_PAIR(int(Config.main_color)));
+			attrset(0);
 			refresh();
 			break;
 		case Design::Alternative:
diff --git a/src/tag_editor.cpp b/src/tag_editor.cpp
index 2655eb66..0f018233 100644
--- a/src/tag_editor.cpp
+++ b/src/tag_editor.cpp
@@ -212,9 +212,9 @@ void TagEditor::switchTo()
 void TagEditor::refresh()
 {
 	Dirs->display();
-	mvvline(MainStartY, MiddleColumnStartX-1, 0, MainHeight);
+	drawSeparator(MiddleColumnStartX-1);
 	TagTypes->display();
-	mvvline(MainStartY, RightColumnStartX-1, 0, MainHeight);
+	drawSeparator(RightColumnStartX-1);
 	Tags->display();
 	
 	if (w == FParserDialog)