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

make Window::SetColor protected as it doesn't respect stacked colors

Browse Source 
it should only be used internally by Window and derives.
This commit is contained in:
Andrzej Rybczak
2009-09-06 12:51:48 +02:00
parent 3aa0f6a03b
commit 56be1cb753
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ncmpcpp.cpp
View File

@@ -275,9 +275,9 @@ int main(int argc, char *argv[])
} }
if (!Config.new_design) if (!Config.new_design)
{ {
wHeader->SetColor(Config.volume_color); *wHeader << Config.volume_color;
*wHeader << XY(wHeader->GetWidth()-VolumeState.length(), 0) << VolumeState; *wHeader << XY(wHeader->GetWidth()-VolumeState.length(), 0) << VolumeState;
wHeader->SetColor(Config.header_color); *wHeader << clEnd;
} }
wHeader->Refresh(); wHeader->Refresh();
RedrawHeader = 0; RedrawHeader = 0;

12
src/status.cpp
View File

@@ -335,9 +335,9 @@ void NcmpcppStatusChanged(Connection *, StatusChanges changed, void *)
case psStop: case psStop:
{ {
WindowTitle("ncmpc++ ver. "VERSION); WindowTitle("ncmpc++ ver. "VERSION);
wFooter->SetColor(Config.progressbar_color); *wFooter << Config.progressbar_color;
mvwhline(wFooter->Raw(), 0, 0, 0, wFooter->GetWidth()); mvwhline(wFooter->Raw(), 0, 0, 0, wFooter->GetWidth());
wFooter->SetColor(Config.statusbar_color); *wFooter << clEnd;
Playlist::ReloadRemaining = 1; Playlist::ReloadRemaining = 1;
myPlaylist->NowPlaying = -1; myPlaylist->NowPlaying = -1;
if (Config.new_design) if (Config.new_design)
@@ -497,7 +497,7 @@ void NcmpcppStatusChanged(Connection *, StatusChanges changed, void *)
{ {
double progressbar_size = elapsed/double(np.GetTotalLength()); double progressbar_size = elapsed/double(np.GetTotalLength());
unsigned howlong = wFooter->GetWidth()*progressbar_size; unsigned howlong = wFooter->GetWidth()*progressbar_size;
wFooter->SetColor(Config.progressbar_color); *wFooter << Config.progressbar_color;
mvwhline(wFooter->Raw(), 0, 0, 0, wFooter->GetWidth()); mvwhline(wFooter->Raw(), 0, 0, 0, wFooter->GetWidth());
if (np.GetTotalLength()) if (np.GetTotalLength())
{ {
@@ -506,7 +506,7 @@ void NcmpcppStatusChanged(Connection *, StatusChanges changed, void *)
if (howlong < wFooter->GetWidth()) if (howlong < wFooter->GetWidth())
*wFooter << Config.progressbar[1]; *wFooter << Config.progressbar[1];
} }
wFooter->SetColor(Config.statusbar_color); *wFooter << Config.statusbar_color;
} }
RedrawStatusbar = 0; RedrawStatusbar = 0;
} }
@@ -621,9 +621,9 @@ void NcmpcppStatusChanged(Connection *, StatusChanges changed, void *)
VolumeState += IntoStr(volume); VolumeState += IntoStr(volume);
VolumeState += "%"; VolumeState += "%";
} }
wHeader->SetColor(Config.volume_color); *wHeader << Config.volume_color;
*wHeader << XY(wHeader->GetWidth()-VolumeState.length(), 0) << VolumeState; *wHeader << XY(wHeader->GetWidth()-VolumeState.length(), 0) << VolumeState;
wHeader->SetColor(Config.header_color); *wHeader << clEnd;
wHeader->Refresh(); wHeader->Refresh();
} }
if (myScreen->ActiveWindow() == myPlaylist->Items) if (myScreen->ActiveWindow() == myPlaylist->Items)

2
src/window.h
View File

@@ -117,7 +117,6 @@ namespace NCurses
bool hasCoords(int &, int &); bool hasCoords(int &, int &);
void SetGetStringHelper(GetStringHelper helper) { itsGetStringHelper = helper; } void SetGetStringHelper(GetStringHelper helper) { itsGetStringHelper = helper; }
void SetColor(Color, Color = clDefault);
void SetBaseColor(Color, Color = clDefault); void SetBaseColor(Color, Color = clDefault);
void SetBorder(Border); void SetBorder(Border);
void SetTimeout(int); void SetTimeout(int);
@@ -172,6 +171,7 @@ namespace NCurses
void Bold(bool) const; void Bold(bool) const;
void Reverse(bool) const; void Reverse(bool) const;
void AltCharset(bool) const; void AltCharset(bool) const;
void SetColor(Color, Color = clDefault);
void ShowBorder() const; void ShowBorder() const;
void AdjustDimensions(size_t &, size_t &); void AdjustDimensions(size_t &, size_t &);