SongRowPaint, StatusBar: use {} initializer syntax for Point

Some compilers don't like using the implicit constructor for initializing fields (looking at you, Apple!)
MusicPlayerDaemon · Aug 30, 2024 · 386e651 · 386e651
1 parent e402a7e
commit 386e651
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/SongRowPaint.cxx b/src/SongRowPaint.cxx
@@ -14,7 +14,7 @@
 #include <string.h>
 
 void
-paint_song_row(WINDOW *w, [[maybe_unused]] unsigned y, unsigned width,
+paint_song_row(WINDOW *w, [[maybe_unused]] int y, unsigned width,
 	       bool selected, bool highlight, const struct mpd_song *song,
 	       [[maybe_unused]] class hscroll *hscroll, const char *format)
 {
@@ -37,7 +37,7 @@ paint_song_row(WINDOW *w, [[maybe_unused]] unsigned y, unsigned width,
 
 	if (hscroll != nullptr && width > 3 &&
 	    StringWidthMB(buffer) >= width) {
-		hscroll->Set(Point(0, y), width, buffer,
+		    hscroll->Set({0, y}, width, buffer,
 			     highlight ? Style::LIST_BOLD : Style::LIST,
 			     selected ? A_REVERSE : 0);
 		hscroll->Paint();

diff --git a/src/SongRowPaint.hxx b/src/SongRowPaint.hxx
@@ -23,7 +23,7 @@ class hscroll;
  * @param format the song format
  */
 void
-paint_song_row(WINDOW *w, unsigned y, unsigned width,
+paint_song_row(WINDOW *w, int y, unsigned width,
 	       bool selected, bool highlight, const struct mpd_song *song,
 	       class hscroll *hscroll, const char *format);
 

diff --git a/src/StatusBar.cxx b/src/StatusBar.cxx
@@ -186,7 +186,7 @@ StatusBar::Update(const struct mpd_status *status,
 			const unsigned center_width =
 				StringWidthMB(center_text.c_str());
 			if (width > 3 && center_width > (unsigned)width) {
-				hscroll.Set(Point(left_width, 0), width,
+				hscroll.Set({(int)left_width, 0}, width,
 					    center_text.c_str(),
 					    Style::STATUS);
 			} else {