From 7f6d469b22f8ebe39c0d8e283c64b623d0530368 Mon Sep 17 00:00:00 2001
From: shenmo <jifengshenmo@outlook.com>
Date: Sun, 14 Jul 2024 16:07:37 +0800
Subject: [PATCH] add-high-dpi

---
 .../scale-set-helper/get-scale.sh             |  6 +++-
 .../scale-set-helper/set-wine-scale.sh        | 30 +++++++++++++++++--
 .../wine-app-launcher/wine-app-launcher.sh    |  2 +-
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/scale-set-helper/get-scale.sh b/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/scale-set-helper/get-scale.sh
index fcf1e23..13d74ba 100755
--- a/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/scale-set-helper/get-scale.sh
+++ b/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/scale-set-helper/get-scale.sh
@@ -66,7 +66,11 @@ scale_factor=`zenity --list \
        1.25 \
 	1.5 \
 	1.75 \
-       2.0`
+       2.0  \
+       2.5  \
+       3.0  \
+       3.5  \   
+       4.0`
 
 case "$scale_factor" in 
 	"")
diff --git a/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/scale-set-helper/set-wine-scale.sh b/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/scale-set-helper/set-wine-scale.sh
index cf0c3a2..65b9616 100755
--- a/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/scale-set-helper/set-wine-scale.sh
+++ b/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/scale-set-helper/set-wine-scale.sh
@@ -4,14 +4,14 @@ help() {
     cat <<EOF
 用法：$0 [-h|--help] [-s|--set-scale-factor] path
 -h|--help               显示这个帮助
--s|--set-scale-factor   直接指定缩放。支持1.0，1.25，1.5，1.75，2.0	
+-s|--set-scale-factor   直接指定缩放。支持1.0，1.25，1.5，1.75，2.0,2.5,3.0,3.5,4.0	
 path                    容器目录
 
                                          本脚本具有超级兔力。
 --------------------------------------------------------------------
 Usage: $0 [-h|--help] [-s|--set-scale-factor] path
 -h|--help               Show this text
--s|--set-scale-factor   Set scale factor direcly. Support 1.0，1.25，1.5，1.75，2.0	
+-s|--set-scale-factor   Set scale factor direcly. Support 1.0，1.25，1.5，1.75，2.0,2.5,3.0,3.5,4.0	
 path                    Wine Container directory path
 
                                          This script have super bunny power.
@@ -96,7 +96,7 @@ echo "使用了--set-scale-factor，直接指定"
 echo "--set-scale-factor detected. Arrange directly"
 
 
-if [ "$appointed_scale_factor" != "1.0" ] && [ "$appointed_scale_factor" != "1.25" ] && [ "$appointed_scale_factor" != "1.5" ]  && [ "$appointed_scale_factor" != "1.75" ] && [ "$appointed_scale_factor" != "2.0" ] ;then
+if [ "$appointed_scale_factor" != "1.0" ] && [ "$appointed_scale_factor" != "1.25" ] && [ "$appointed_scale_factor" != "1.5" ]  && [ "$appointed_scale_factor" != "1.75" ] && [ "$appointed_scale_factor" != "2.0" ] && [ "$appointed_scale_factor" != "2.5" ] && [ "$appointed_scale_factor" != "3.0" ] && [ "$appointed_scale_factor" != "3.5" ] && [ "$appointed_scale_factor" != "4.0" ];then
 echo "无法识别的倍数：$appointed_scale_factor，请参看$0 -h"
 echo "Unrecognizable number. Use $0 -h to get help"
 exit 1
@@ -128,6 +128,18 @@ case "$wine_scale" in
         2.0*)
             reg_text="\"LogPixels\"=dword:000000C0"
             ;;
+        2.5*)
+            reg_text="\"LogPixels\"=dword:000000F0"
+            ;;
+        3.0*)
+            reg_text="\"LogPixels\"=dword:00000120"
+            ;;
+        3.5*)
+            reg_text="\"LogPixels\"=dword:00000150"
+            ;;
+        4.0*)
+            reg_text="\"LogPixels\"=dword:00000180"
+            ;;
 	*)
 		reg_text="\"LogPixels\"=dword:00000060"
 		#可能不是Xorg
@@ -172,6 +184,18 @@ case "$wine_scale" in
         2.0*)
             dpi="192"
             ;;
+        2.5*)
+            dpi="240"
+            ;;
+        3.0*)
+            dpi="288"
+            ;;
+        3.5*)
+            dpi="336"
+            ;;
+        4.0*)
+            dpi="384"
+            ;;
 	*)
 		dpi="96"
 		#可能不是Xorg或者是其他错误
diff --git a/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/wine-app-launcher/wine-app-launcher.sh b/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/wine-app-launcher/wine-app-launcher.sh
index 51e4cbc..23c792c 100755
--- a/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/wine-app-launcher/wine-app-launcher.sh
+++ b/spark-dwine-helper/s-wine-helper/opt/apps/store.spark-app.spark-dwine-helper/files/deepinwine/tools/spark-dwine-helper/wine-app-launcher/wine-app-launcher.sh
@@ -171,7 +171,7 @@ select_scale_action() {
     local app_dir="/opt/apps/$app"
     local run_script="$app_dir/files/run.sh"
     local bottle_name=$(grep -oP 'BOTTLENAME="\K[^"]+' "$run_script")
-    local scale_factors=("1.0" "1.25" "1.5" "1.75" "2.0" "恢复默认")
+    local scale_factors=("1.0" "1.25" "1.5" "1.75" "2.0" "2.5" "3.0" "3.5" "4.0" "恢复默认")
     local choice=$(zenity --width=800 --height=600 --list --title="选择缩放比例" --text="选择要设置的缩放比例" --column="比例" "${scale_factors[@]}")
     
     if [ -n "$choice" ]; then