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

display: rewrite Display::Columns and Display::SongsInColumns

Browse Source
This commit is contained in:
Andrzej Rybczak
2012-08-26 20:45:54 +02:00
parent b299806a90
commit 9e071b074c
5 changed files with 190 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/settings.cpp
View File

@@ -371,6 +371,7 @@ void Configuration::SetDefaults()
search_engine_default_search_mode = 0;
visualizer_sync_interval = 30;
locked_screen_width_part = 0.5;
selected_item_prefix_length = 0;
selected_item_suffix_length = 0;
now_playing_suffix_length = 0;
# ifdef HAVE_LANGINFO_H
@@ -655,6 +656,7 @@ void Configuration::Read()
{
selected_item_prefix.Clear();
String2Buffer(v, selected_item_prefix);
selected_item_prefix_length = Window::Length(TO_WSTRING(selected_item_prefix.Str()));
}
}
else if (name == "selected_item_suffix")
@@ -672,6 +674,7 @@ void Configuration::Read()
{
now_playing_prefix.Clear();
String2Buffer(v, now_playing_prefix);
now_playing_prefix_length = Window::Length(TO_WSTRING(now_playing_prefix.Str()));
}
}
else if (name == "now_playing_suffix")
@@ -1121,6 +1124,23 @@ void Configuration::GenerateColumns()
columns.push_back(col);
}
// calculate which column is the last one to have relative width and stretch it accordingly
if (!columns.empty())
{
int stretch_limit = 0;
auto it = columns.rbegin();
for (; it != columns.rend(); ++it)
{
if (it->fixed)
stretch_limit += it->width;
else
break;
}
// if it's false, all columns are fixed
if (it != columns.rend())
it->stretch_limit = stretch_limit;
}
// generate format for converting tags in columns to string for Playlist::SongInColumnsToString()
char tag[] = "{% }|";
song_in_columns_to_string_format = "{";