GameList: Address review feedback for favorite indicator

Author: Vishrut2403

pcsx2-qt/GameList/GameListModel.cpp

@@ -317,7 +317,7 @@ QVariant GameListModel::data(const QModelIndex& index, const int role) const
 
 		case NeedsFavoriteBadgeRole:
 		{
-			if (index.column() == Column_Cover || index.column() == Column_Favorite)
+			if (index.column() == Column_Cover)
 				return ge->is_favorite;
 			return QVariant();
 		}
@@ -410,6 +410,8 @@ bool GameListModel::lessThan(const QModelIndex& left_index, const QModelIndex& r
 			return (StringUtil::Strcasecmp(left->serial.c_str(), right->serial.c_str()) < 0);
 		}
 
+		case Column_Favorite:
+			[[fallthrough]];
 		case Column_Title:
 			return titlesLessThan(left_row, right_row);
 
@@ -472,9 +474,6 @@ bool GameListModel::lessThan(const QModelIndex& left_index, const QModelIndex& r
 			return (left->last_played_time < right->last_played_time);
 		}
 
-		case Column_Favorite:
-			return titlesLessThan(left_row, right_row);
-
 		default:
 			return false;
 	}

pcsx2-qt/GameList/GameListModel.h

@@ -67,7 +67,7 @@ class GameListModel final : public QAbstractTableModel
 	bool lessThan(const QModelIndex& left_index, const QModelIndex& right_index, int column) const;
 
 	bool getShowCoverTitles() const { return m_show_titles_for_covers; }
-	QPixmap getFavoritePixmap() const { return m_favorite_pixmap; }
+	const QPixmap& getFavoritePixmap() const { return m_favorite_pixmap; }
 	void setShowCoverTitles(bool enabled) { m_show_titles_for_covers = enabled; }
 
 	float getCoverScale() const { return m_cover_scale; }

pcsx2-qt/GameList/GameListWidget.cpp

@@ -52,7 +52,7 @@ static constexpr Qt::SortOrder DEFAULT_SORT_ORDER = Qt::AscendingOrder;
 static constexpr std::array<int, GameListModel::Column_Count> DEFAULT_COLUMN_WIDTHS = {{
 	55,  // type
 	85,  // code
-	95,  // favorite
+	55,  // favorite
 	-1,  // title
 	-1,  // file title
 	75,  // crc
@@ -139,8 +139,8 @@ namespace
 		static constexpr int STAR_MARGIN = 4;
 
 		GameListIconStyleDelegate(QWidget* parent, const GameListModel* model)
-		: QStyledItemDelegate(parent)
-		, m_model(model)
+			: QStyledItemDelegate(parent)
+			, m_model(model)
 		{
 		}
 		~GameListIconStyleDelegate() = default;
@@ -169,7 +169,7 @@ namespace
 			// Determine starting location of icon (Qt uses top-left origin).
 			const int icon_width = static_cast<int>(static_cast<qreal>(icon.width()) / icon.devicePixelRatio());
 			const int icon_height = static_cast<int>(static_cast<qreal>(icon.height()) / icon.devicePixelRatio());
-			const QPoint icon_top_left = QPoint((rect.width() - icon_width) / 2, (rect.height() - icon_height) / 2);
+			const QPoint icon_top_left = rect.topLeft() + QPoint((rect.width() - icon_width) / 2, (rect.height() - icon_height) / 2);
 
 			// Change palette if the item is selected.
 			if (option.state & QStyle::State_Selected)
@@ -195,20 +195,23 @@ namespace
 					QPixmapCache::insert(key, highlighted_icon);
 				}
 
-				painter->drawPixmap(rect.topLeft() + icon_top_left, highlighted_icon);
+				painter->drawPixmap(icon_top_left, highlighted_icon);
 			}
 			else
 			{
-				painter->drawPixmap(rect.topLeft() + icon_top_left, icon);
+				painter->drawPixmap(icon_top_left, icon);
 			}
 
 			// Draw star overlay on bottom-right corner if game is favorited.
 			const bool is_favorite = (index.column() == GameListModel::Column_Cover) &&
 				index.data(GameListModel::NeedsFavoriteBadgeRole).toBool();
 			if (is_favorite)
 			{
-				const QPoint star_pos = rect.bottomRight() - QPoint(STAR_SIZE + STAR_MARGIN, STAR_SIZE + STAR_MARGIN);
-				painter->drawPixmap(star_pos, m_model->getFavoritePixmap());
+				const QPixmap& star = m_model->getFavoritePixmap();
+				const QPoint icon_bottom_right = icon_top_left + QPoint(icon_width, icon_height);
+				const QSizeF size = star.deviceIndependentSize();
+				const QPoint star_pos = icon_bottom_right - QPoint(size.width() + STAR_MARGIN, size.height() + STAR_MARGIN);
+				painter->drawPixmap(star_pos, star);
 			}
 
 			// Restore the old clip path.