From de6b17fcda7dc8448223ca5b15bee29038e0409a Mon Sep 17 00:00:00 2001
From: Roy Qu <royqh1979@gmail.com>
Date: Sat, 11 Mar 2023 08:32:52 +0800
Subject: [PATCH] upgrade to 2.18

---
 NEWS.md                     |  4 ++++
 RedPandaIDE/RedPandaIDE.pro |  2 +-
 RedPandaIDE/main.cpp        | 13 ++-----------
 Red_Panda_CPP.pro           |  2 +-
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index a7cb5069..f4d0f39d 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,7 @@
+Red Panda C++ Version 2.18
+
+  - fix: macos icon size overgrown
+
 Red Panda C++ Version 2.17
 
   - enhancement: Add X86_64 AVX/AVX instruction descriptions to asm syntaxer.
diff --git a/RedPandaIDE/RedPandaIDE.pro b/RedPandaIDE/RedPandaIDE.pro
index 26e017a6..277d1e29 100644
--- a/RedPandaIDE/RedPandaIDE.pro
+++ b/RedPandaIDE/RedPandaIDE.pro
@@ -8,7 +8,7 @@ isEmpty(APP_NAME) {
 }
 
 isEmpty(APP_VERSION) {
-    APP_VERSION = 2.17
+    APP_VERSION = 2.18
 }
 
 contains(QMAKE_HOST.arch, x86_64):{
diff --git a/RedPandaIDE/main.cpp b/RedPandaIDE/main.cpp
index fb709e44..72a03fd8 100644
--- a/RedPandaIDE/main.cpp
+++ b/RedPandaIDE/main.cpp
@@ -243,19 +243,10 @@ void setTheme(const QString& theme) {
 
 int main(int argc, char *argv[])
 {
-    //QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-//#ifdef Q_OS_WIN
-//    QApplication::setAttribute(Qt::AA_DisableHighDpiScaling);
-//    QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
-//    qputenv("QT_SCALE_FACTOR_ROUNDING_POLICY","PassThrough");
-//    qputenv("QT_DEVICE_PIXEL_RATIO ","auto");
-//    qputenv("QT_AUTO_SCREEN_SCALE_FACTOR","false");
-//#endif
     QApplication app(argc, argv);
-#ifdef Q_OS_MACOS
-    // Fix macOS overgrown icon size issue
+
     app.setAttribute(Qt::AA_UseHighDpiPixmaps);
-#endif
+
     QFile tempFile(QDir::tempPath()+QDir::separator()+"RedPandaDevCppStartUp.lock");
     {
         bool firstRun;
diff --git a/Red_Panda_CPP.pro b/Red_Panda_CPP.pro
index 1621ba6d..ed03f1f7 100644
--- a/Red_Panda_CPP.pro
+++ b/Red_Panda_CPP.pro
@@ -14,7 +14,7 @@ qsynedit.subdir = libs/qsynedit
 
 APP_NAME = RedPandaCPP
 
-APP_VERSION = 2.17
+APP_VERSION = 2.18
 
 # Add the dependencies so that the RedPandaIDE project can add the depended programs
 # into the main app bundle