qtui: Allow hiding the album art in info bar

Based on the patch by "sn0w sn0w" who suggested it here:
https://redmine.audacious-media-player.org/boards/1/topics/2518

Author: radioactiveman

src/qtui/info_bar.cc

@@ -192,6 +192,8 @@ InfoBar::InfoBar(QWidget * parent)
     update_vis();
     setFixedHeight(ps.Height);
 
+    m_art_enabled = aud_get_bool("qtui", "infoarea_show_art");
+
     for (SongData & d : sd)
     {
         d.title.setTextFormat(Qt::PlainText);
@@ -213,10 +215,7 @@ InfoBar::InfoBar(QWidget * parent)
 
 void InfoBar::resizeEvent(QResizeEvent *)
 {
-    // re-ellipsize text on next paintEvent
-    for (SongData & d : sd)
-        d.title.setText(QString());
-
+    reellipsize_title();
     m_vis->move(width() - ps.VisWidth, 0);
 }
 
@@ -225,13 +224,15 @@ void InfoBar::paintEvent(QPaintEvent *)
     QPainter p(this);
 
     int viswidth = m_vis->isVisible() ? ps.VisWidth : 0;
+    int offset = m_art_enabled ? ps.Height : ps.Spacing;
+
     p.fillRect(0, 0, width() - viswidth, ps.Height, m_vis->gradient());
 
     for (SongData & d : sd)
     {
         p.setOpacity((qreal)d.alpha / FadeSteps);
 
-        if (!d.art.isNull())
+        if (m_art_enabled && !d.art.isNull())
         {
             auto sz = d.art.size() / d.art.devicePixelRatio();
             int left = ps.Spacing + (ps.IconSize - sz.width()) / 2;
@@ -248,19 +249,19 @@ void InfoBar::paintEvent(QPaintEvent *)
             QFontMetrics metrics = p.fontMetrics();
             d.title = QStaticText(metrics.elidedText(
                 d.orig_title, Qt::ElideRight,
-                width() - viswidth - ps.Height - ps.Spacing));
+                width() - viswidth - offset - ps.Spacing));
         }
 
         p.setPen(QColor(255, 255, 255));
-        p.drawStaticText(ps.Height, ps.Spacing, d.title);
+        p.drawStaticText(offset, ps.Spacing, d.title);
 
         font.setPointSize(9);
         p.setFont(font);
 
-        p.drawStaticText(ps.Height, ps.Spacing + ps.IconSize / 2, d.artist);
+        p.drawStaticText(offset, ps.Spacing + ps.IconSize / 2, d.artist);
 
         p.setPen(QColor(179, 179, 179));
-        p.drawStaticText(ps.Height, ps.Spacing + ps.IconSize * 3 / 4, d.album);
+        p.drawStaticText(offset, ps.Spacing + ps.IconSize * 3 / 4, d.album);
     }
 }
 
@@ -331,12 +332,23 @@ void InfoBar::playback_stop_cb()
     fade_timer.start();
 }
 
-void InfoBar::update_vis()
+void InfoBar::reellipsize_title()
 {
     // re-ellipsize text on next paintEvent
     for (SongData & d : sd)
         d.title.setText(QString());
+}
 
+void InfoBar::update_vis()
+{
+    reellipsize_title();
     m_vis->enable(aud_get_bool("qtui", "infoarea_show_vis"));
     update();
 }
+
+void InfoBar::update_art()
+{
+    reellipsize_title();
+    m_art_enabled = aud_get_bool("qtui", "infoarea_show_art");
+    update();
+}

src/qtui/info_bar.h

@@ -44,13 +44,16 @@ class InfoBar : public QWidget
 
     void playback_ready_cb();
     void playback_stop_cb();
+    void reellipsize_title();
     void update_vis();
+    void update_art();
 
-    const HookReceiver<InfoBar> hook1{"tuple change", this,
-                                      &InfoBar::update_title},
+    const HookReceiver<InfoBar>
+        hook1{"tuple change", this, &InfoBar::update_title},
         hook2{"playback ready", this, &InfoBar::playback_ready_cb},
         hook3{"playback stop", this, &InfoBar::playback_stop_cb},
-        hook4{"qtui toggle infoarea_vis", this, &InfoBar::update_vis};
+        hook4{"qtui toggle infoarea_vis", this, &InfoBar::update_vis},
+        hook5{"qtui toggle infoarea_art", this, &InfoBar::update_art};
 
     const Timer<InfoBar> fade_timer{TimerRate::Hz30, this, &InfoBar::do_fade};
 
@@ -73,6 +76,7 @@ class InfoBar : public QWidget
 
     SongData sd[2];
     bool m_stopped;
+    bool m_art_enabled;
 };
 
 #endif

src/qtui/menus.cc

@@ -91,6 +91,10 @@ static void toggle_infoarea_vis()
 {
     hook_call("qtui toggle infoarea_vis", nullptr);
 }
+static void toggle_infoarea_art()
+{
+    hook_call("qtui toggle infoarea_art", nullptr);
+}
 static void toggle_statusbar() { hook_call("qtui toggle statusbar", nullptr); }
 static void toggle_remaining_time()
 {
@@ -257,6 +261,8 @@ QMenuBar * qtui_build_menubar(QWidget * parent)
                           {"qtui", "infoarea_visible"}, toggle_infoarea),
         audqt::MenuToggle({N_("Show Info Bar Vis_ualization")},
                           {"qtui", "infoarea_show_vis"}, toggle_infoarea_vis),
+        audqt::MenuToggle({N_("Show Info Bar _Album Art")},
+                          {"qtui", "infoarea_show_art"}, toggle_infoarea_art),
         audqt::MenuToggle({N_("Show _Status Bar"), nullptr, "Shift+Ctrl+S"},
                           {"qtui", "statusbar_visible"}, toggle_statusbar),
         audqt::MenuSep(),

src/qtui/settings.cc

@@ -29,6 +29,7 @@
 const char * const qtui_defaults[] = {
     // clang-format off
     "infoarea_show_vis", "TRUE",
+    "infoarea_show_art", "TRUE",
     "infoarea_visible", "TRUE",
     "menu_visible", "TRUE",
     "playlist_tabs_visible", aud::numeric_string<PlaylistTabVisibility::AutoHide>::str,