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

handle height of sorting window properly

Browse Source 
before, if terminal was less than 18 lines high, ncmpcpp
would exit at start throwing NCurses::Window::BadSize,
because sort dialog's height was hardcoded. now its size
changes dynamically, depending on actual screen size.
This commit is contained in:
Andrzej Rybczak
2009-04-26 13:20:01 +02:00
parent b5b5d64c80
commit e3d731d269
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/playlist.cpp
View File

@@ -43,9 +43,8 @@ bool Playlist::BlockRefreshing = 0;
Menu< std::pair<std::string, MPD::Song::GetFunction> > *Playlist::SortDialog;
const size_t Playlist::SortOptions = 10;
const size_t Playlist::SortDialogWidth = 30;
const size_t Playlist::SortDialogHeight = 18;
size_t Playlist::SortDialogHeight;
void Playlist::Init()
{
@@ -60,6 +59,8 @@ void Playlist::Init()
w->SetGetStringFunction(Config.columns_in_playlist ? SongInColumnsToString : SongToString);
w->SetGetStringFunctionUserData(Config.columns_in_playlist ? &Config.song_columns_list_format : &Config.song_list_format);
SortDialogHeight = std::min(int(MainHeight-2), 18);
SortDialog = new Menu< std::pair<std::string, MPD::Song::GetFunction> >((COLS-SortDialogWidth)/2, (LINES-SortDialogHeight)/2, SortDialogWidth, SortDialogHeight, "Sort songs by...", Config.main_color, Config.window_border);
SortDialog->SetTimeout(ncmpcpp_window_timeout);
SortDialog->CyclicScrolling(Config.use_cyclic_scrolling);
@@ -101,6 +102,9 @@ void Playlist::Resize()
{
w->Resize(COLS, MainHeight);
w->SetTitle(Config.columns_in_playlist ? Display::Columns(Config.song_columns_list_format) : "");
SortDialogHeight = std::min(int(MainHeight-2), 18);
if (MainHeight > 6)
SortDialog->Resize(SortDialogWidth, SortDialogHeight);
SortDialog->MoveTo((COLS-SortDialogWidth)/2, (LINES-SortDialogHeight)/2);
hasToBeResized = 0;
}
@@ -151,7 +155,7 @@ void Playlist::ApplyFilter(const std::string &s)
void Playlist::Sort()
{
if (w->GetWidth() < SortDialogWidth || w->GetHeight() < SortDialogHeight)
if (w->GetWidth() < SortDialogWidth || MainHeight <= 6)
{
ShowMessage("Screen is too small to display dialog window!");
return;