Qt: Fix HiDPI icon scaling #5463

spycrab · 2017-05-21T13:46:32Z

No description provided.

Source/Core/DolphinQt2/Config/ControllersWindow.cpp

@@ -93,7 +93,10 @@ void ControllersWindow::CreateGamecubeLayout()
  m_gc_box = new QGroupBox();
  m_gc_layout = new QFormLayout();
  m_gc_label = new QLabel();
-  m_gc_label->setPixmap(QPixmap(m_gamecube_icon));
+
+  auto pixmap = QPixmap(m_gamecube_icon).scaled(QSize(64, 64));


spycrab · 2017-05-22T11:28:46Z

Ready to be reviewed & merged now.

JosJuice

Unless I've missed something, the game list is still using low-res images on high-DPI screens.

Source/Core/DolphinQt2/Config/ControllersWindow.cpp

-      m_wii_icon(Settings().GetResourcesDir().append(QStringLiteral("Platform_Wii.png")))
+      m_gamecube_icon(
+          Settings().GetResourcesDir().append(QStringLiteral("Platform_Gamecube@2x.png"))),
+      m_wii_icon(Settings().GetResourcesDir().append(QStringLiteral("Platform_Wii@2x.png")))


Source/Core/DolphinQt2/GameList/GameFile.cpp

+  std::string number = QString::number(num, 'f', 1).toStdString();
+
+  if (num == static_cast<int>(num))
+    number = number.substr(0, number.length() - 2);


Starsam80 · 2017-05-22T17:30:18Z

Toolbar icons are still not scaled, and the icons seem a bit fuzzy
snip

Here is WX for a comparison
snip

Starsam80 · 2017-05-22T21:39:31Z

LGTM:

ligfx

This still doesn't work on macOS, use the Qt HighDpi attributes, or use devicePixelRatio() correctly. Could you please go over the patch I posted above again, and make sure you understand it? I'm usually on IRC if you have more questions.

Source/Core/DolphinQt2/DPI.cpp

+{
+double GetScale()
+{
+  return static_cast<QGuiApplication*>(QGuiApplication::instance())->devicePixelRatio() * 1.1;


Source/Core/DolphinQt2/DPI.cpp

+  return static_cast<QGuiApplication*>(QGuiApplication::instance())->devicePixelRatio() * 1.1;
+}
+
+double GetScaledIconSize(const double scale)


Source/Core/DolphinQt2/GameList/GameFile.cpp

+  std::string number = QString::number(num, 'f', 1).toStdString();
+
+  if (num == static_cast<int>(num))
+    number = number.substr(0, number.length() - 2);


Source/Core/DolphinQt2/GameList/GameList.cpp

@@ -83,7 +83,7 @@ void GameList::MakeTableView()
  QHeaderView* hor_header = m_table->horizontalHeader();
  hor_header->setSectionResizeMode(GameListModel::COL_PLATFORM, QHeaderView::ResizeToContents);
  hor_header->setSectionResizeMode(GameListModel::COL_COUNTRY, QHeaderView::ResizeToContents);
-  hor_header->setSectionResizeMode(GameListModel::COL_ID, QHeaderView::ResizeToContents);
+  hor_header->setSectionResizeMode(GameListModel::COL_ID, QHeaderView::Fixed);


Source/Core/DolphinQt2/GameList/TableDelegate.cpp

  case GameListModel::COL_ID:
+    painter->drawText(option.rect,


Source/Core/DolphinQt2/GameList/TableDelegate.cpp

+  const auto height =
+      static_cast<double>(pixmap.height()) / (icon_scaled ? Resources::GetIconScale() : 1) * scale;
+
+  DrawPixmap(painter, rect, icon_scaled ?


Source/Core/DolphinQt2/GameList/TableDelegate.h

@@ -11,10 +11,13 @@ class TableDelegate final : public QStyledItemDelegate
  Q_OBJECT

 public:
-  explicit TableDelegate(QWidget* parent = nullptr);


Source/Core/DolphinQt2/GameList/TableDelegate.h

-  void DrawPixmap(QPainter* painter, const QRect& rect, const QPixmap& pixmap) const;
+  void DrawPixmap(QPainter* painter, const QRect& rect, const QPixmap& pixmap,
+                  const QSize& size) const;
+  void DrawPixmap(QPainter* painter, const QRect& rect, const QPixmap& pixmap,


Source/Core/DolphinQt2/ToolBar.cpp

 {
  setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
  setMovable(false);
  setFloatable(false);
-  setIconSize(ICON_SIZE);
+  setIconSize(ICON_SIZE * m_scale);


Source/Core/DolphinQt2/ToolBar.cpp

-  m_controllers_action->setIcon(QIcon(QStringLiteral("classic.png").prepend(dir)));
+  const QString suffix = DPI::GetScaledIconSuffix(m_scale, 2);
+
+  m_open_action->setIcon(QIcon(QStringLiteral("open%1.png").arg(suffix).prepend(dir)));


Source/Core/DolphinQt2/GameList/TableDelegate.cpp

    break;
  case GameListModel::COL_BANNER:
    DrawPixmap(painter, option.rect,
-               data.value<QPixmap>().scaled(NORMAL_BANNER_SIZE, Qt::KeepAspectRatio,
-                                            Qt::SmoothTransformation));
+               data.value<QPixmap>().scaled(NORMAL_BANNER_SIZE * scale, Qt::KeepAspectRatio,


Starsam80

Other than a few comments, tested and LGTM.

Source/Core/DolphinQt2/Resources.cpp

  for (QString country : countries)
-    m_countries.append(QPixmap(country.prepend(sys_dir)));
+    m_countries.append(QPixmap(country.arg(GetPreferredIconScale()).prepend(sys_dir)));

  QStringList ratings{QStringLiteral("rating0.png"), QStringLiteral("rating1.png"),


Source/Core/DolphinQt2/Resources.cpp

@@ -40,7 +56,9 @@ void Resources::Init()
    m_ratings.append(QPixmap(rating.prepend(sys_dir)));

  m_misc.append(QPixmap(QStringLiteral("nobanner.png").prepend(sys_dir)));


Source/Core/DolphinQt2/Resources.cpp

-  m_misc.append(QPixmap(QStringLiteral("dolphin_logo.png").prepend(sys_dir)));
+  m_misc.append(QPixmap(QStringLiteral("dolphin_logo%1.png")
+                            .arg(Resources::GetPreferredIconScale())
+                            .prepend(sys_dir)));
  m_misc.append(QPixmap(QStringLiteral("Dolphin.png").prepend(sys_dir)));


ligfx

Works great on macOS. Couple code cleanup things.

Source/Core/DolphinQt2/Resources.cpp

  for (QString country : countries)
-    m_countries.append(QPixmap(country.prepend(sys_dir)));
+    m_countries.append(QPixmap(country.arg(GetPreferredIconScale()).prepend(sys_dir)));

  QStringList ratings{QStringLiteral("rating0.png"), QStringLiteral("rating1.png"),


Source/Core/DolphinQt2/Resources.cpp

-  m_misc.append(QPixmap(QStringLiteral("dolphin_logo.png").prepend(sys_dir)));
+  m_misc.append(QPixmap(QStringLiteral("dolphin_logo%1.png")
+                            .arg(Resources::GetPreferredIconScale())
+                            .prepend(sys_dir)));
  m_misc.append(QPixmap(QStringLiteral("Dolphin.png").prepend(sys_dir)));


Source/Core/DolphinQt2/ToolBar.cpp

-  m_screenshot_action->setIcon(QIcon(QStringLiteral("screenshot.png").prepend(dir)));
-  m_config_action->setIcon(QIcon(QStringLiteral("config.png").prepend(dir)));
-  m_controllers_action->setIcon(QIcon(QStringLiteral("classic.png").prepend(dir)));
+  m_open_action->setIcon(


Source/Core/DolphinQt2/Resources.cpp

@@ -13,25 +17,37 @@ QList<QPixmap> Resources::m_countries;
 QList<QPixmap> Resources::m_ratings;
 QList<QPixmap> Resources::m_misc;

+QString Resources::GetPreferredIconScale(int max)


Source/Core/DolphinQt2/Resources.cpp

  for (QString country : countries)
-    m_countries.append(QPixmap(country.prepend(sys_dir)));
+    m_countries.append(QPixmap(country.arg(GetPreferredIconScale()).prepend(sys_dir)));


Source/Core/DolphinQt2/Resources.cpp

  for (QString platform : platforms)
-    m_platforms.append(QPixmap(platform.prepend(sys_dir)));
+    m_platforms.append(GetScaledIcon(platform.prepend(QStringLiteral("Platform_"))));


Source/Core/DolphinQt2/Resources.cpp

  for (QString country : countries)
-    m_countries.append(QPixmap(country.prepend(sys_dir)));
+    m_countries.append(GetScaledIcon(country.prepend(QStringLiteral("Flag_"))));


Source/Core/DolphinQt2/ToolBar.cpp

+  m_fullscreen_action->setIcon(QIcon(Resources::GetScaledThemeIcon(QStringLiteral("fullscreen"))));
+  m_screenshot_action->setIcon(QIcon(Resources::GetScaledThemeIcon(QStringLiteral("screenshot"))));
+  m_config_action->setIcon(QIcon(Resources::GetScaledThemeIcon(QStringLiteral("config"))));
+  m_controllers_action->setIcon(QIcon(Resources::GetScaledThemeIcon(QStringLiteral("classic"))));


Source/Core/DolphinQt2/Resources.cpp

@@ -13,25 +17,37 @@ QList<QPixmap> Resources::m_countries;
 QList<QPixmap> Resources::m_ratings;
 QList<QPixmap> Resources::m_misc;

+QString Resources::GetPreferredIconScale(int max)


Source/Core/DolphinQt2/Resources.cpp

+    return QStringLiteral("");
+}
+
+QPixmap Resources::GetScaledIcon(const QString& name, int max, const QString& dir)


Source/Core/DolphinQt2/Resources.cpp

+    return QStringLiteral("");
+}
+
+QPixmap Resources::GetScaledIcon(const QString& name, int max, const QString& dir)


Source/Core/DolphinQt2/Resources.cpp


 QList<QPixmap> Resources::m_platforms;
 QList<QPixmap> Resources::m_countries;
 QList<QPixmap> Resources::m_ratings;
 QList<QPixmap> Resources::m_misc;

+QString Resources::GetPreferredIconScale(int max)


Source/Core/DolphinQt2/Resources.h

@@ -26,6 +26,11 @@ class Resources final
    LOGO_SMALL
  };

+  static QString GetPreferredIconScale(int max = 4);


Source/Core/DolphinQt2/Resources.h

+  static QString GetPreferredIconScale(int max = 4);
+  static QPixmap GetScaledIcon(const QString& name, int max = 4,
+                               const QString& dir = QStringLiteral(""));
+  static QPixmap GetScaledThemeIcon(const QString& name, int max = 4);


spycrab · 2017-05-28T16:37:20Z

I think this can be merged now as all points have been addressed

ligfx · 2017-05-28T20:26:40Z

@spycrab That's not how it works :) Make changes, get more reviews, then merge.

Source/Core/DolphinQt2/Resources.cpp

+    return QStringLiteral("");
+}
+
+QPixmap Resources::GetScaledPixmap(const std::string& name, int max, Resources::Directory dir)


Source/Core/DolphinQt2/Resources.h

+    Theme
+  };
+
+  static QString GetPreferredIconScale(int max = 4);


Source/Core/DolphinQt2/ToolBar.cpp

-  m_screenshot_action->setIcon(QIcon(QStringLiteral("screenshot.png").prepend(dir)));
-  m_config_action->setIcon(QIcon(QStringLiteral("config.png").prepend(dir)));
-  m_controllers_action->setIcon(QIcon(QStringLiteral("classic.png").prepend(dir)));
+  m_open_action->setIcon(QIcon(Resources::GetScaledPixmap("open", 4, Resources::Directory::Theme)));


Source/Core/DolphinQt2/Resources.cpp


 QList<QPixmap> Resources::m_platforms;
 QList<QPixmap> Resources::m_countries;
 QList<QPixmap> Resources::m_ratings;
 QList<QPixmap> Resources::m_misc;

+QString Resources::GetPreferredPixmapScale(int max)


Source/Core/DolphinQt2/Resources.cpp

+  QPixmap pixmap;
+  for (int scale : {4, 2, 1})
+  {
+    pixmap = QPixmap(QStringLiteral("%1%2%3.png")


Source/Core/DolphinQt2/Resources.cpp

+    return QStringLiteral("");
+}
+
+QPixmap Resources::GetScaledPixmap(const std::string& name, bool is_themed)


Source/Core/DolphinQt2/Resources.cpp

+QPixmap Resources::GetScaledPixmap(const std::string& name, bool is_themed)
+{
+  QPixmap pixmap;
+  for (int scale : {4, 2, 1})


spycrab · 2017-05-30T18:30:35Z

@ligfx Can you take a look again?

ligfx

Looks great @spycrab! One small thing left.

Source/Core/DolphinQt2/Resources.cpp

+  const auto sizes = icon.availableSizes();
+  const auto dpr = QGuiApplication::primaryScreen()->devicePixelRatio();
+
+  return icon.pixmap(sizes[std::min((dpr <= 1) ? 1 : (dpr <= 2) ? 2 : 4, sizes.size() - 1)]);


ligfx

Cool, that fixed it. Great job. This makes DolphinQt2 look so much better!

spycrab force-pushed the qt_hidpi branch from 15d5194 to ef17aff Compare May 21, 2017 13:49

JosJuice reviewed May 21, 2017

View reviewed changes

spycrab force-pushed the qt_hidpi branch 12 times, most recently from e2c4490 to 21c9891 Compare May 21, 2017 17:30

spycrab changed the title ~~[WIP] Qt: Fix HiDPI icon scaling~~ Qt: Fix HiDPI icon scaling May 21, 2017

spycrab changed the title ~~Qt: Fix HiDPI icon scaling~~ [WIP] Qt: Fix HiDPI icon scaling May 21, 2017

spycrab force-pushed the qt_hidpi branch 3 times, most recently from 1919a22 to 7ea4b1c Compare May 22, 2017 11:28

spycrab changed the title ~~[WIP] Qt: Fix HiDPI icon scaling~~ Qt: Fix HiDPI icon scaling May 22, 2017

JosJuice reviewed May 22, 2017

View reviewed changes

spycrab force-pushed the qt_hidpi branch 6 times, most recently from 7a445e7 to 8b3216f Compare May 22, 2017 21:35

ligfx suggested changes May 26, 2017

View reviewed changes

ligfx reviewed May 26, 2017

View reviewed changes

spycrab force-pushed the qt_hidpi branch 2 times, most recently from 65e643c to 3846e90 Compare May 27, 2017 09:41

Starsam80 reviewed May 28, 2017

View reviewed changes

ligfx suggested changes May 28, 2017

View reviewed changes

spycrab force-pushed the qt_hidpi branch 2 times, most recently from dffdf50 to df36821 Compare May 28, 2017 09:31

ligfx suggested changes May 28, 2017

View reviewed changes

spycrab force-pushed the qt_hidpi branch from df36821 to 15d8e6d Compare May 28, 2017 10:33

ligfx suggested changes May 28, 2017

View reviewed changes

spycrab force-pushed the qt_hidpi branch 2 times, most recently from 21721f8 to 37db2f8 Compare May 28, 2017 22:19

ligfx reviewed May 29, 2017

View reviewed changes

Source/Core/DolphinQt2/Resources.cpp Outdated

QPixmap pixmap;

for (int scale : {4, 2, 1})

{

pixmap = QPixmap(QStringLiteral("%1%2%3.png")

This comment was marked as off-topic.

Sign in to view

ligfx reviewed May 29, 2017

View reviewed changes

Source/Core/DolphinQt2/Resources.cpp Outdated

return QStringLiteral("");

}

QPixmap Resources::GetScaledPixmap(const std::string& name, bool is_themed)

This comment was marked as off-topic.

Sign in to view

ligfx reviewed May 29, 2017

View reviewed changes

Source/Core/DolphinQt2/Resources.cpp Outdated

QPixmap Resources::GetScaledPixmap(const std::string& name, bool is_themed)

{

QPixmap pixmap;

for (int scale : {4, 2, 1})

This comment was marked as off-topic.

Sign in to view

spycrab force-pushed the qt_hidpi branch from 37db2f8 to 75af209 Compare May 29, 2017 11:19

ligfx suggested changes May 30, 2017

View reviewed changes

spycrab force-pushed the qt_hidpi branch from 75af209 to fe662f9 Compare May 30, 2017 20:36

Qt: Fix HiDPI icon scaling

1737e81

spycrab force-pushed the qt_hidpi branch from fe662f9 to 1737e81 Compare May 30, 2017 20:42

ligfx approved these changes May 30, 2017

View reviewed changes

spycrab mentioned this pull request May 30, 2017

Qt: Implement new, themed stars #5502

Merged

Helios747 merged commit 25f24d3 into dolphin-emu:master May 30, 2017

spycrab deleted the qt_hidpi branch May 31, 2017 03:48

leoetlino modified the milestone: Qt Sep 13, 2017

		@@ -40,7 +56,9 @@ void Resources::Init()
		m_ratings.append(QPixmap(rating.prepend(sys_dir)));

		m_misc.append(QPixmap(QStringLiteral("nobanner.png").prepend(sys_dir)));

Qt: Fix HiDPI icon scaling #5463

Qt: Fix HiDPI icon scaling #5463

Conversation

spycrab commented May 21, 2017

This comment was marked as off-topic.

This comment was marked as off-topic.

spycrab commented May 22, 2017

JosJuice left a comment

Choose a reason for hiding this comment

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

Starsam80 commented May 22, 2017 • edited

Starsam80 commented May 22, 2017

ligfx left a comment

Choose a reason for hiding this comment

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

Starsam80 left a comment

Choose a reason for hiding this comment

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

ligfx left a comment

Choose a reason for hiding this comment

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

spycrab commented May 28, 2017

ligfx commented May 28, 2017

This comment was marked as off-topic.

This comment was marked as off-topic.

Starsam80 commented May 22, 2017 •

edited