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

make SelectedItemsAdder::{Width,Height} vars follow the rest of private members

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-08-30 00:13:45 +02:00
parent 4f3040e0ec
commit 62ba4ce343
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/misc.cpp
View File

@@ -37,7 +37,7 @@ SelectedItemsAdder *mySelectedItemsAdder = new SelectedItemsAdder;
void SelectedItemsAdder::Init() void SelectedItemsAdder::Init()
{ {
SetDimensions(); SetDimensions();
w = new Menu<std::string>((COLS-Width)/2, (MainHeight-Height)/2+MainStartY, Width, Height, "Add selected items to...", Config.main_color, Config.window_border); w = new Menu<std::string>((COLS-itsWidth)/2, (MainHeight-itsHeight)/2+MainStartY, itsWidth, itsHeight, "Add selected items to...", Config.main_color, Config.window_border);
w->SetTimeout(ncmpcpp_window_timeout); w->SetTimeout(ncmpcpp_window_timeout);
w->CyclicScrolling(Config.use_cyclic_scrolling); w->CyclicScrolling(Config.use_cyclic_scrolling);
w->HighlightColor(Config.main_highlight_color); w->HighlightColor(Config.main_highlight_color);
@@ -101,10 +101,10 @@ void SelectedItemsAdder::SwitchTo()
void SelectedItemsAdder::Resize() void SelectedItemsAdder::Resize()
{ {
SetDimensions(); SetDimensions();
if (Height < 5) // screen to low to display this window if (itsHeight < 5) // screen too low to display this window
return myOldScreen->SwitchTo(); return myOldScreen->SwitchTo();
w->Resize(Width, Height); w->Resize(itsWidth, itsHeight);
w->MoveTo((COLS-Width)/2, (MainHeight-Height)/2+MainStartY); w->MoveTo((COLS-itsWidth)/2, (MainHeight-itsHeight)/2+MainStartY);
if (myOldScreen && myOldScreen->hasToBeResized) // resize background window if (myOldScreen && myOldScreen->hasToBeResized) // resize background window
{ {
myOldScreen->Resize(); myOldScreen->Resize();
@@ -184,7 +184,7 @@ void SelectedItemsAdder::MouseButtonPressed(MEVENT me)
void SelectedItemsAdder::SetDimensions() void SelectedItemsAdder::SetDimensions()
{ {
Width = COLS*0.6; itsWidth = COLS*0.6;
Height = std::min(size_t(LINES*0.6), MainHeight); itsHeight = std::min(size_t(LINES*0.6), MainHeight);
} }

4
src/misc.h
View File

@@ -46,8 +46,8 @@ class SelectedItemsAdder : public Screen< Menu<std::string> >
private: private:
void SetDimensions(); void SetDimensions();
size_t Width; size_t itsWidth;
size_t Height; size_t itsHeight;
}; };
extern SelectedItemsAdder *mySelectedItemsAdder; extern SelectedItemsAdder *mySelectedItemsAdder;