From ff9024ae70404368a98055d33ed812e134f12be9 Mon Sep 17 00:00:00 2001
From: Megamouse <studienricky89@googlemail.com>
Date: Thu, 28 Jun 2018 02:12:51 +0200
Subject: [PATCH] Qt: temporary game grid selection color adjustment
---
rpcs3/rpcs3qt/game_list_frame.cpp | 4 ++--
rpcs3/rpcs3qt/game_list_frame.h | 2 +-
rpcs3/rpcs3qt/game_list_grid_delegate.cpp | 12 ++++--------
rpcs3/rpcs3qt/game_list_grid_delegate.h | 4 ++--
4 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp
index abd904e58b..5ff383e9e8 100644
--- a/rpcs3/rpcs3qt/game_list_frame.cpp
+++ b/rpcs3/rpcs3qt/game_list_frame.cpp
@@ -909,7 +909,7 @@ bool game_list_frame::DeleteSPUCache(const std::string& base_dir, bool is_intera
return true;
}
-QPixmap game_list_frame::PaintedPixmap(const QImage& img, bool paintConfigIcon)
+QPixmap game_list_frame::PaintedPixmap(const QImage& img, bool paint_config_icon)
{
QImage scaled = QImage(m_Icon_Size, QImage::Format_ARGB32);
scaled.fill(m_Icon_Color);
@@ -921,7 +921,7 @@ QPixmap game_list_frame::PaintedPixmap(const QImage& img, bool paintConfigIcon)
painter.drawImage(QPoint(0, 0), img.scaled(m_Icon_Size, Qt::KeepAspectRatio, Qt::TransformationMode::SmoothTransformation));
}
- if (paintConfigIcon && !m_isListLayout)
+ if (paint_config_icon && !m_isListLayout)
{
int width = m_Icon_Size.width() * 0.2;
QPoint origin = QPoint(m_Icon_Size.width() - width, 0);
diff --git a/rpcs3/rpcs3qt/game_list_frame.h b/rpcs3/rpcs3qt/game_list_frame.h
index 783ef102ac..1e3d7682f9 100644
--- a/rpcs3/rpcs3qt/game_list_frame.h
+++ b/rpcs3/rpcs3qt/game_list_frame.h
@@ -228,7 +228,7 @@ protected:
void resizeEvent(QResizeEvent *event) override;
bool eventFilter(QObject *object, QEvent *event) override;
private:
- QPixmap PaintedPixmap(const QImage& img, bool paintConfigIcon = false);
+ QPixmap PaintedPixmap(const QImage& img, bool paint_config_icon = false);
void ShowCustomConfigIcon(QTableWidgetItem* item, bool enabled);
void PopulateGameGrid(int maxCols, const QSize& image_size, const QColor& image_color);
bool IsEntryVisible(const game_info& game);
diff --git a/rpcs3/rpcs3qt/game_list_grid_delegate.cpp b/rpcs3/rpcs3qt/game_list_grid_delegate.cpp
index 72190d9ed3..32c4414ca4 100644
--- a/rpcs3/rpcs3qt/game_list_grid_delegate.cpp
+++ b/rpcs3/rpcs3qt/game_list_grid_delegate.cpp
@@ -1,7 +1,7 @@
#include "game_list_grid_delegate.h"
game_list_grid_delegate::game_list_grid_delegate(const QSize& size, const qreal& margin_factor, const qreal& text_factor, const QFont& font, const QColor& font_color, QObject *parent)
- : QAbstractItemDelegate(parent), m_size(size), m_margin_factor(margin_factor), m_text_factor(text_factor), m_font(font), m_font_color(font_color)
+ : QStyledItemDelegate(parent), m_size(size), m_margin_factor(margin_factor), m_text_factor(text_factor), m_font(font), m_font_color(font_color)
{
}
@@ -15,8 +15,8 @@ void game_list_grid_delegate::paint(QPainter * painter, const QStyleOptionViewIt
painter->eraseRect(r);
- //Get title and image
- QPixmap image = (qvariant_cast<QPixmap>(index.data(Qt::DecorationRole)));
+ // Get title and image
+ QPixmap image = qvariant_cast<QPixmap>(index.data(Qt::DecorationRole));
QString title = index.data(Qt::DisplayRole).toString();
// image
@@ -28,11 +28,7 @@ void game_list_grid_delegate::paint(QPainter * painter, const QStyleOptionViewIt
// Add selection overlay
if (option.state & QStyle::State_Selected)
{
- QLinearGradient gradientSelected(r.left(), r.top(), r.left(), r.height() + r.top());
- gradientSelected.setColorAt(0.0, QColor::fromRgba(qRgba(119, 213, 247, 128)));
- gradientSelected.setColorAt(0.9, QColor::fromRgba(qRgba(27, 134, 183, 128)));
- gradientSelected.setColorAt(1.0, QColor::fromRgba(qRgba(0, 120, 174, 128)));
- painter->fillRect(r, gradientSelected);
+ painter->fillRect(r, QColor(20, 138, 255, 128));
}
int h = r.height() / (1 + m_margin_factor + m_margin_factor*m_text_factor);
diff --git a/rpcs3/rpcs3qt/game_list_grid_delegate.h b/rpcs3/rpcs3qt/game_list_grid_delegate.h
index 1115a2a1a5..bee26db683 100644
--- a/rpcs3/rpcs3qt/game_list_grid_delegate.h
+++ b/rpcs3/rpcs3qt/game_list_grid_delegate.h
@@ -1,9 +1,9 @@
#pragma once
#include <QPainter>
-#include <QAbstractItemDelegate>
+#include <QStyledItemDelegate>
-class game_list_grid_delegate : public QAbstractItemDelegate
+class game_list_grid_delegate : public QStyledItemDelegate
{
public:
game_list_grid_delegate(const QSize& imageSize, const qreal& margin_factor, const qreal& margin_ratio, const QFont& font, const QColor& font_color, QObject *parent = 0);