From 015faab572f5cdb631e649276cd69b0d22ccd721 Mon Sep 17 00:00:00 2001 From: John Lindgren Date: Sun, 6 Sep 2015 06:18:47 -0400 Subject: [PATCH] skins[-qt]: Inhibit focus rectangle for a single selected entry. --- src/skins-qt/playlist-widget.cc | 6 +++++- src/skins/playlist-widget.cc | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/skins-qt/playlist-widget.cc b/src/skins-qt/playlist-widget.cc index b3830cad40..07b8e30c0b 100644 --- a/src/skins-qt/playlist-widget.cc +++ b/src/skins-qt/playlist-widget.cc @@ -248,7 +248,11 @@ void PlaylistWidget::draw (QPainter & cr) /* focus rectangle */ int focus = aud_playlist_get_focus (m_playlist); - if (focus >= m_first && focus <= m_first + m_rows - 1) + + /* don't show rectangle if this is the only selected entry */ + if (focus >= m_first && focus <= m_first + m_rows - 1 && + (! aud_playlist_entry_get_selected (m_playlist, focus) || + aud_playlist_selected_count (m_playlist) > 1)) { cr.setPen (QColor (skin.colors[SKIN_PLEDIT_NORMAL])); cr.drawRect (0, m_offset + m_row_height * (focus - m_first), m_width - 1, m_row_height - 1); diff --git a/src/skins/playlist-widget.cc b/src/skins/playlist-widget.cc index 798d3915c7..d493eb688e 100644 --- a/src/skins/playlist-widget.cc +++ b/src/skins/playlist-widget.cc @@ -280,7 +280,11 @@ void PlaylistWidget::draw (cairo_t * cr) /* focus rectangle */ int focus = aud_playlist_get_focus (m_playlist); - if (focus >= m_first && focus <= m_first + m_rows - 1) + + /* don't show rectangle if this is the only selected entry */ + if (focus >= m_first && focus <= m_first + m_rows - 1 && + (! aud_playlist_entry_get_selected (m_playlist, focus) || + aud_playlist_selected_count (m_playlist) > 1)) { cairo_new_path (cr); cairo_set_line_width (cr, 1);