rearrange sequence of arguments to Scroller()

src/browser.cpp

@@ -88,7 +88,7 @@ void Browser::SwitchTo()
 std::basic_string<my_char_t> Browser::Title()
 {
 	std::basic_string<my_char_t> result = U("Browse: ");
-	result += Scroller(itsBrowsedDir, COLS-result.length()-(Config.new_design ? 2 : VolumeState.length()), itsScrollBeginning);
+	result += Scroller(itsBrowsedDir, itsScrollBeginning, w->GetWidth()-result.length()-(Config.new_design ? 2 : VolumeState.length()));
 	return result;
 }
 

src/helpers.cpp

@@ -347,13 +347,13 @@ Buffer ShowTag(const std::string &tag)
 }
 
 #ifdef _UTF8
-std::basic_string<my_char_t> Scroller(const std::string &str, size_t width, size_t &pos)
+std::basic_string<my_char_t> Scroller(const std::string &str, size_t &pos, size_t width)
 {
-	return Scroller(TO_WSTRING(str), width, pos);
+	return Scroller(TO_WSTRING(str), pos, width);
 }
 #endif // _UTF8
 
-std::basic_string<my_char_t> Scroller(const std::basic_string<my_char_t> &str, size_t width, size_t &pos)
+std::basic_string<my_char_t> Scroller(const std::basic_string<my_char_t> &str, size_t &pos, size_t width)
 {
 	std::basic_string<my_char_t> s(str);
 	if (!Config.header_text_scrolling)

src/helpers.h

@@ -116,9 +116,9 @@ std::string ExtractTopDirectory(const std::string &);
 Buffer ShowTag(const std::string &);
 
 #ifdef _UTF8
-std::basic_string<my_char_t> Scroller(const std::string &, size_t, size_t &);
+std::basic_string<my_char_t> Scroller(const std::string &str, size_t &pos, size_t width);
 #endif // _UTF8
-std::basic_string<my_char_t> Scroller(const std::basic_string<my_char_t> &, size_t, size_t &);
+std::basic_string<my_char_t> Scroller(const std::basic_string<my_char_t> &str, size_t &pos, size_t width);
 
 #ifdef HAVE_CURL_CURL_H
 size_t write_data(char *, size_t, size_t, void *);

src/lyrics.cpp

@@ -191,7 +191,7 @@ void Lyrics::SwitchTo()
 std::basic_string<my_char_t> Lyrics::Title()
 {
 	std::basic_string<my_char_t> result = U("Lyrics: ");
-	result += Scroller(itsSong.toString("{%a - %t}"), COLS-result.length()-(Config.new_design ? 2 : VolumeState.length()), itsScrollBegin);
+	result += Scroller(itsSong.toString("{%a - %t}"), itsScrollBegin, w->GetWidth()-result.length()-(Config.new_design ? 2 : VolumeState.length()));
 	return result;
 }
 

src/playlist.cpp

@@ -119,7 +119,7 @@ std::basic_string<my_char_t> Playlist::Title()
 	std::basic_string<my_char_t> result = U("Playlist ");
 	if (ReloadTotalLength || ReloadRemaining)
 		itsBufferedStats = TotalLength();
-	result += Scroller(itsBufferedStats, w->GetWidth()-result.length()-(Config.new_design ? 2 : VolumeState.length()), itsScrollBegin);
+	result += Scroller(itsBufferedStats, itsScrollBegin, w->GetWidth()-result.length()-(Config.new_design ? 2 : VolumeState.length()));
 	return result;
 }