dpi=96 by default

data_from_portwine/scripts/functions_helper

@@ -1495,18 +1495,6 @@ convert_dec_and_hex () {
     esac
 }
 
-recommend_dpi () {
-    local height=$1
-
-    if [[ -z "$height" ]] ; then
-        echo "disabled"
-        return 1
-    fi
-    local dpi=$(( height / 11 ))
-    (( dpi < 96 )) && dpi="96"
-    echo "$dpi"
-}
-
 fixes_after_update () {
     local fixes_path line fixes_info IFS
     fixes_info=$1
@@ -4603,13 +4591,10 @@ fi
         get_and_set_reg_file --delete 'Software\Wine\Drivers' 'Graphics'
     fi
 
-    if [[ $PW_WINE_DPI_VALUE != "disabled" ]] ; then
+    if [[ $PW_WINE_DPI_VALUE =~ (disabled|recommended|96) ]] ; then
-        if [[ $PW_WINE_DPI_VALUE == "recommended" ]] ; then
+        get_and_set_reg_file --add 'Control Panel\Desktop' 'LogPixels' 'REG_DWORD' "96" "user"
-            PW_RECOMMENDED_DPI=$(recommend_dpi "${PW_SCREEN_RESOLUTION:5:8}")
+    else
-            get_and_set_reg_file --add 'Control Panel\Desktop' 'LogPixels' 'REG_DWORD' "$PW_RECOMMENDED_DPI" "user"
+        get_and_set_reg_file --add 'Control Panel\Desktop' 'LogPixels' 'REG_DWORD' "$PW_WINE_DPI_VALUE" "user"
-        else
-            get_and_set_reg_file --add 'Control Panel\Desktop' 'LogPixels' 'REG_DWORD' "$PW_WINE_DPI_VALUE" "user"
-        fi
     fi
 
     case "$PW_SOUND_DRIVER_USE" in

data_from_portwine/scripts/start.sh

@@ -276,23 +276,6 @@ if [[ -z $SORT_WITH_TIME ]] ; then
     export SORT_WITH_TIME="lastlaunch"
 fi
 
-# TODO:fixes_after_update (со временем можно будет дропнуть)
-# Оставил для примера
-# if fixes_after_update "2395: DESKTOP_WITH_TIME by default displays hours and minutes" ; then
-#     DESKTOP_WITH_TIME="posnumber1"
-#     edit_user_conf_from_gui DESKTOP_WITH_TIME
-# fi
-# if fixes_after_update "2398: SORT_WITH_TIME by default sorts from the last run" ; then
-#     SORT_WITH_TIME="lastlaunch"
-#     edit_user_conf_from_gui SORT_WITH_TIME
-# fi
-
-# choose wine dpi default
-if [[ -z $PW_WINE_DPI_VALUE ]] ; then
-    echo 'export PW_WINE_DPI_VALUE="recommended"' >> "$USER_CONF"
-    export PW_WINE_DPI_VALUE="recommended"
-fi
-
 if check_gamescope_session
 then PW_TERM="env LANG=C xterm -fullscreen -bg black -fg white -e"
 else PW_TERM="env LANG=C xterm -bg black -fg white -e"
@@ -348,7 +331,7 @@ if [[ ${portwine_exe,,} =~ (setup|install|.msi$) ]] ; then
     export PW_USE_GAMEMODE="0"
     export PW_DLL_INSTALL=""
     # export WINEDLLOVERRIDES="mscoree,mshtml="
-    export PW_WINE_USE="WINE_LG"
+    export PW_WINE_USE="PROTON_LG"
 
     export PW_USE_SETUP_FILE="1"
 fi

data_from_portwine/scripts/var

@@ -28,6 +28,7 @@ export PW_PREFIX_NAME="DEFAULT"
 export WINE_WIN_START="start /wait /high /unix"
 export WINE_ALLOW_XIM="0"
 export PW_USE_SHADER_CACHE="1"
+export PW_WINE_DPI_VALUE="96"
 export PW_WINE_CPU_TOPOLOGY="disabled"
 export PW_MESA_GL_VERSION_OVERRIDE="disabled"
 export PW_MESA_VK_WSI_PRESENT_MODE="disabled"