Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix color of window separators in media library etc.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
src/media_library.cpp
View File

@@ -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())
{

3
src/ncmpcpp.cpp
View File

@@ -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;

2
src/playlist_editor.cpp
View File

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

10
src/screen.cpp
View File

@@ -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
{

1
src/screen.h
View File

@@ -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);

2
src/status.cpp
View File

@@ -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:

4
src/tag_editor.cpp
View File

@@ -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)