fix color of window separators in media library etc.

This commit is contained in:
Andrzej Rybczak
2014-09-03 21:27:43 +02:00
parent fb0b2158e3
commit 5ce193303b
7 changed files with 10 additions and 16 deletions

View File

@@ -226,9 +226,9 @@ void MediaLibrary::resize()
void MediaLibrary::refresh() void MediaLibrary::refresh()
{ {
Tags.display(); Tags.display();
mvvline(MainStartY, itsMiddleColStartX-1, 0, MainHeight); drawSeparator(itsMiddleColStartX-1);
Albums.display(); Albums.display();
mvvline(MainStartY, itsRightColStartX-1, 0, MainHeight); drawSeparator(itsRightColStartX-1);
Songs.display(); Songs.display();
if (Albums.empty()) if (Albums.empty())
{ {

View File

@@ -115,9 +115,6 @@ int main(int argc, char **argv)
NC::initScreen("ncmpcpp ver. " VERSION, Config.colors_enabled); NC::initScreen("ncmpcpp ver. " VERSION, Config.colors_enabled);
Actions::OriginalStatusbarVisibility = Config.statusbar_visibility; Actions::OriginalStatusbarVisibility = Config.statusbar_visibility;
// for column separators
attron(COLOR_PAIR(int(Config.main_color)));
if (Config.design == Design::Alternative) if (Config.design == Design::Alternative)
Config.statusbar_visibility = 0; Config.statusbar_visibility = 0;

View File

@@ -121,7 +121,7 @@ std::wstring PlaylistEditor::title()
void PlaylistEditor::refresh() void PlaylistEditor::refresh()
{ {
Playlists.display(); Playlists.display();
mvvline(MainStartY, RightColumnStartX-1, 0, MainHeight); drawSeparator(RightColumnStartX-1);
Content.display(); Content.display();
} }

View File

@@ -28,9 +28,7 @@ using Global::myScreen;
using Global::myLockedScreen; using Global::myLockedScreen;
using Global::myInactiveScreen; using Global::myInactiveScreen;
namespace {// void drawSeparator(int x)
void drawScreenSeparator(int x)
{ {
attron(COLOR_PAIR(int(Config.main_color))); attron(COLOR_PAIR(int(Config.main_color)));
mvvline(Global::MainStartY, x, 0, Global::MainHeight); mvvline(Global::MainStartY, x, 0, Global::MainHeight);
@@ -38,8 +36,6 @@ void drawScreenSeparator(int x)
refresh(); refresh();
} }
}
void genericMouseButtonPressed(NC::Window &w, MEVENT me) void genericMouseButtonPressed(NC::Window &w, MEVENT me)
{ {
if (me.bstate & BUTTON2_PRESSED) if (me.bstate & BUTTON2_PRESSED)
@@ -94,7 +90,7 @@ void BaseScreen::getWindowResizeParams(size_t &x_offset, size_t &width, bool adj
{ {
myLockedScreen->resize(); myLockedScreen->resize();
myLockedScreen->refresh(); 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 // as in "else" case. we also need to refresh it and redraw separator between
// them as stacked screen probably has overwritten part ot it. // them as stacked screen probably has overwritten part ot it.
myInactiveScreen->refresh(); myInactiveScreen->refresh();
drawScreenSeparator(COLS*Config.locked_screen_width_part); drawSeparator(COLS*Config.locked_screen_width_part);
} }
else else
{ {

View File

@@ -25,6 +25,7 @@
#include "scrollpad.h" #include "scrollpad.h"
#include "screen_type.h" #include "screen_type.h"
void drawSeparator(int x);
void genericMouseButtonPressed(NC::Window &w, MEVENT me); void genericMouseButtonPressed(NC::Window &w, MEVENT me);
void scrollpadMouseButtonPressed(NC::Scrollpad &w, MEVENT me); void scrollpadMouseButtonPressed(NC::Scrollpad &w, MEVENT me);

View File

@@ -567,7 +567,7 @@ void Status::Changes::flags()
attron(COLOR_PAIR(int(Config.state_line_color))); attron(COLOR_PAIR(int(Config.state_line_color)));
mvprintw(1, COLS-2, "]"); mvprintw(1, COLS-2, "]");
} }
attrset(COLOR_PAIR(int(Config.main_color))); attrset(0);
refresh(); refresh();
break; break;
case Design::Alternative: case Design::Alternative:

View File

@@ -212,9 +212,9 @@ void TagEditor::switchTo()
void TagEditor::refresh() void TagEditor::refresh()
{ {
Dirs->display(); Dirs->display();
mvvline(MainStartY, MiddleColumnStartX-1, 0, MainHeight); drawSeparator(MiddleColumnStartX-1);
TagTypes->display(); TagTypes->display();
mvvline(MainStartY, RightColumnStartX-1, 0, MainHeight); drawSeparator(RightColumnStartX-1);
Tags->display(); Tags->display();
if (w == FParserDialog) if (w == FParserDialog)