HiDPI stuff

Disable SVG icons (again), we only used 3 as a workaround for hidpi issues when using pixmaps in css, but that has now been fixed. We are now ~99% done with HiDPI UI support.
irwant · Aug 11, 2024 · 8b0ba2b · 8b0ba2b
1 parent a00c6b4
commit 8b0ba2b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 26 deletions.
diff --git a/src/app/friction.qss b/src/app/friction.qss
@@ -63,13 +63,13 @@ QSpinBox::down-button {
 }
 QDoubleSpinBox::up-arrow,
 QSpinBox::up-arrow {
-    image: url(:/icons/hicolor/scalable/actions/go-up.svg); /* half */
+    image: url(:/icons/hicolor/%11x%11/actions/go-up.png);
     width: %10px;
     height: %10px;
 }
 QDoubleSpinBox::down-arrow,
 QSpinBox::down-arrow {
-    image: url(:/icons/hicolor/scalable/actions/go-down.svg); /* half */
+    image: url(:/icons/hicolor/%11x%11/actions/go-down.png);
     width: %10px;
     height: %10px;
 }
@@ -229,7 +229,7 @@ QComboBox::drop-down:button{
 
 QToolButton::menu-arrow,
 QComboBox::down-arrow {
-    image: url(:/icons/hicolor/scalable/actions/go-down.svg); /* full */
+    image: url(:/icons/hicolor/%11x%11/actions/go-down.png);
     width: %7px;
     height: %7px;
 }
@@ -490,13 +490,13 @@ QCheckBox::indicator:hover:unchecked {
 }
 
 QCheckBox::indicator:checked {
-    image: url(:/icons/hicolor/scalable/actions/dialog-ok.svg);
+    image: url(:/icons/hicolor/%11x%11/actions/dialog-ok.png);
     width: %7px;
     height: %7px;
 }
 
 QCheckBox::indicator:unchecked {
-    image: url(:/icons/hicolor/scalable/actions/dialog-cancel.svg);
+    image: url(:/icons/hicolor/%11x%11/actions/dialog-cancel.png);
     width: %7px;
     height: %7px;
 }

diff --git a/src/app/icons b/src/app/icons
diff --git a/src/cmake/friction-common.cmake b/src/cmake/friction-common.cmake
@@ -87,7 +87,7 @@ find_package(
     Multimedia
     Qml
     Xml
-    Svg
+    #Svg
     REQUIRED
 )
 set(QT_LIBRARIES
@@ -98,7 +98,7 @@ set(QT_LIBRARIES
     Qt${QT_VERSION_MAJOR}::Multimedia
     Qt${QT_VERSION_MAJOR}::Qml
     Qt${QT_VERSION_MAJOR}::Xml
-    Qt${QT_VERSION_MAJOR}::Svg
+    #Qt${QT_VERSION_MAJOR}::Svg
 )
 
 if(WIN32)

diff --git a/src/core/themesupport.cpp b/src/core/themesupport.cpp
@@ -192,21 +192,6 @@ const QString ThemeSupport::getThemeStyle(int iconSize)
         css = stylesheet.readAll();
         stylesheet.close();
     }
-#ifdef Q_OS_WIN
-    // svg in qss on windows are broken!
-    css.replace("/scalable/actions/go-up.svg); /* half */",
-                "/%11x%11/actions/go-up.png);");
-    css.replace("/scalable/actions/go-up.svg); /* full */",
-                "/%11x%11/actions/go-up.png);");
-    css.replace("/scalable/actions/go-down.svg); /* half */",
-                "/%11x%11/actions/go-down.png);");
-    css.replace("/scalable/actions/go-down.svg); /* full */",
-                "/%11x%11/actions/go-down.png);");
-    css.replace("/scalable/actions/dialog-ok.svg",
-                "/%11x%11/actions/dialog-ok.png");
-    css.replace("/scalable/actions/dialog-cancel.svg",
-                "/%11x%11/actions/dialog-cancel.png");
-#endif
     const qreal iconPixelRatio = iconSize * qApp->desktop()->devicePixelRatioF();
     return css.arg(getThemeButtonBaseColor().name(),
                    getThemeButtonBorderColor().name(),

diff --git a/src/scripts/build_ci.bat b/src/scripts/build_ci.bat
@@ -57,7 +57,7 @@ set OUTPUT_DIR="%CWD%\build\output\friction-%VERSION%"
 mkdir "%OUTPUT_DIR%"
 mkdir "%OUTPUT_DIR%\audio"
 mkdir "%OUTPUT_DIR%\platforms"
-mkdir "%OUTPUT_DIR%\imageformats"
+REM mkdir "%OUTPUT_DIR%\imageformats"
 
 copy "%CWD%\build\src\core\%BDIR%\frictioncore.dll" "%OUTPUT_DIR%\"
 copy "%CWD%\build\src\ui\%BDIR%\frictionui.dll" "%OUTPUT_DIR%\"
@@ -71,13 +71,13 @@ copy "%SDK_DIR%\bin\Qt5Network.dll" "%OUTPUT_DIR%\"
 copy "%SDK_DIR%\bin\Qt5OpenGL.dll" "%OUTPUT_DIR%\"
 copy "%SDK_DIR%\bin\Qt5PrintSupport.dll" "%OUTPUT_DIR%\"
 copy "%SDK_DIR%\bin\Qt5Qml.dll" "%OUTPUT_DIR%\"
-copy "%SDK_DIR%\bin\Qt5Svg.dll" "%OUTPUT_DIR%\"
+REM copy "%SDK_DIR%\bin\Qt5Svg.dll" "%OUTPUT_DIR%\"
 copy "%SDK_DIR%\bin\Qt5Widgets.dll" "%OUTPUT_DIR%\"
 copy "%SDK_DIR%\bin\Qt5Xml.dll" "%OUTPUT_DIR%\"
 copy "%SDK_DIR%\bin\qscintilla2_qt5.dll" "%OUTPUT_DIR%\"
 copy "%SDK_DIR%\plugins\audio\qtaudio_wasapi.dll" "%OUTPUT_DIR%\audio\"
 copy "%SDK_DIR%\plugins\platforms\qwindows.dll" "%OUTPUT_DIR%\platforms\"
-copy "%SDK_DIR%\plugins\imageformats\qsvg.dll" "%OUTPUT_DIR%\imageformats\"
+REM copy "%SDK_DIR%\plugins\imageformats\qsvg.dll" "%OUTPUT_DIR%\imageformats\"
 copy "%SDK_DIR%\bin\avcodec-58.dll" "%OUTPUT_DIR%\"
 copy "%SDK_DIR%\bin\avdevice-58.dll" "%OUTPUT_DIR%\"
 copy "%SDK_DIR%\bin\avformat-58.dll" "%OUTPUT_DIR%\"