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

move wstring related functions to wide_char file

Browse Source
This commit is contained in:
Andrzej Rybczak
2012-09-08 18:42:59 +02:00
parent d5e2d315fd
commit 84326efc46
23 changed files with 204 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/display.cpp
View File

@@ -225,7 +225,7 @@ void showSongsInColumns(NC::Menu<T> &menu, const MPD::Song &s, HasSongs &screen)
}
if (tag.empty() && it->display_empty_tag)
tag = ToWString(Config.empty_tag);
NC::Window::cut(tag, width);
wideCut(tag, width);
if (!discard_colors && it->color != NC::clDefault)
menu << it->color;
@@ -234,7 +234,7 @@ void showSongsInColumns(NC::Menu<T> &menu, const MPD::Song &s, HasSongs &screen)
// if column uses right alignment, calculate proper offset.
// otherwise just assume offset is 0, ie. we start from the left.
if (it->right_alignment)
x_off = std::max(0, width - int(NC::Window::length(tag)));
x_off = std::max(0, width - int(wideLength(tag)));
whline(menu.raw(), KEY_SPACE, width);
menu.goToXY(x + x_off, y);
@@ -314,9 +314,9 @@ std::string Display::Columns(size_t list_width)
}
else
name = it->name;
NC::Window::cut(name, width);
wideCut(name, width);
int x_off = std::max(0, width - int(NC::Window::length(name)));
int x_off = std::max(0, width - int(wideLength(name)));
if (it->right_alignment)
{
result += std::string(x_off, KEY_SPACE);