From 6a7b929657d3d72fabaff556e2a517394706736b Mon Sep 17 00:00:00 2001 From: kraxarn Date: Tue, 27 Jun 2023 16:03:40 +0200 Subject: [PATCH] Make icon explicit argument --- src/util/tooltip.cpp | 8 ++++---- src/util/tooltip.hpp | 4 ++-- src/view/artist/albumslist.cpp | 2 +- src/view/artist/trackslist.cpp | 2 +- src/view/search/albums.cpp | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/util/tooltip.cpp b/src/util/tooltip.cpp index f6c5d4f3..9c956261 100644 --- a/src/util/tooltip.cpp +++ b/src/util/tooltip.cpp @@ -14,9 +14,9 @@ Tooltip::Tooltip(lib::settings &settings, { } -void Tooltip::set(QListWidgetItem *item, const lib::spt::track &track) +void Tooltip::set(QListWidgetItem *item, const lib::spt::track &track, const QIcon &albumIcon) { - const auto icon = item->icon().pixmap(albumSize, albumSize); + const auto icon = albumIcon.pixmap(albumSize, albumSize); item->setToolTip(tooltip(track, icon)); } @@ -29,9 +29,9 @@ void Tooltip::set(QTreeWidgetItem *item, const lib::spt::track &track) }); } -void Tooltip::set(QTreeWidgetItem *item, const lib::spt::album &album) +void Tooltip::set(QTreeWidgetItem *item, const lib::spt::album &album, const QIcon &albumIcon) { - const auto icon = item->icon(0).pixmap(albumSize, albumSize); + const auto icon = albumIcon.pixmap(albumSize, albumSize); item->setToolTip(0, tooltip(album, icon)); } diff --git a/src/util/tooltip.hpp b/src/util/tooltip.hpp index 8be9aabe..b52a316b 100644 --- a/src/util/tooltip.hpp +++ b/src/util/tooltip.hpp @@ -16,9 +16,9 @@ class Tooltip Tooltip(lib::settings &settings, const lib::http_client &httpClient, lib::cache &cache); - void set(QListWidgetItem *item, const lib::spt::track &track); + void set(QListWidgetItem *item, const lib::spt::track &track, const QIcon &albumIcon); void set(QTreeWidgetItem *item, const lib::spt::track &track); - void set(QTreeWidgetItem *item, const lib::spt::album &album); + void set(QTreeWidgetItem *item, const lib::spt::album &album, const QIcon &albumIcon); private: static constexpr int iconSize = 16; diff --git a/src/view/artist/albumslist.cpp b/src/view/artist/albumslist.cpp index 52a44884..2936facd 100644 --- a/src/view/artist/albumslist.cpp +++ b/src/view/artist/albumslist.cpp @@ -178,5 +178,5 @@ void Artist::AlbumsList::onItemEntered(QTreeWidgetItem *item, int column) } const auto album = getAlbum(item); - tooltip.set(item, album); + tooltip.set(item, album, item->icon(0)); } diff --git a/src/view/artist/trackslist.cpp b/src/view/artist/trackslist.cpp index f8737cc1..9f3a00c7 100644 --- a/src/view/artist/trackslist.cpp +++ b/src/view/artist/trackslist.cpp @@ -108,5 +108,5 @@ void Artist::TracksList::onItemEntered(QListWidgetItem *item) const auto &trackData = item->data(static_cast(DataRole::Track)); const auto &track = trackData.value(); - tooltip.set(item, track); + tooltip.set(item, track, item->icon()); } diff --git a/src/view/search/albums.cpp b/src/view/search/albums.cpp index cf70da5c..1b771f09 100644 --- a/src/view/search/albums.cpp +++ b/src/view/search/albums.cpp @@ -76,5 +76,5 @@ void Search::Albums::onItemEntered(QTreeWidgetItem *item, int column) const auto albumData = item->data(0, static_cast(DataRole::Album)); const auto album = albumData.value(); - tooltip.set(item, album); + tooltip.set(item, album, item->icon(0)); }