From 4e060f821558aae0d05b3a436ca1c1dd16aae0b2 Mon Sep 17 00:00:00 2001
From: Mikhail Tergoev <fidel@altlinux.org>
Date: Sat, 9 Nov 2024 15:08:55 +0300
Subject: [PATCH] change recomend dpi and added 80 dpi

---
 data_from_portwine/changelog_en             | 1 +
 data_from_portwine/changelog_ru             | 4 ++++
 data_from_portwine/scripts/functions_helper | 4 ++--
 data_from_portwine/scripts/start.sh         | 3 ++-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en
index 694b117..e722496 100755
--- a/data_from_portwine/changelog_en
+++ b/data_from_portwine/changelog_en
@@ -3,6 +3,7 @@ You can help us in the development of the project on the website: https://linux-
 Changelog:
 
 ###Scripts version 2371### / Date: 08.11.2024 / Download update size: 4 megabytes
+* added auto-detection of application scaling, with the ability to change it in the global PP settings (thanks to Htylol)
 * FUTEX2 is disabled by default (breaks some games)
 * added auto-installation of the Saturn game (thanks to Dervart)
 * added the ability to select a dark/light theme in the global PP settings (thanks to Htylol)
diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru
index 49cdaa3..89cde8c 100755
--- a/data_from_portwine/changelog_ru
+++ b/data_from_portwine/changelog_ru
@@ -2,7 +2,11 @@
 -----------------------------------------
 История изменений:
 
+* множество оптимизаций скриптов (спасибо Htylol)
+* уменьшено рекомендуемое масштабирование 
+
 ###Scripts version 2371### / Дата: 08.11.2024 / Размер скачиваемого обновления: 4 мегабайта
+* добавлено автоопределение масштабирования приложений, с возможностью изменения в глобальных настройках PP (спасибо Htylol)
 * FUTEX2 отключен по умолчанию (ломает работу некоторых игр)
 * добавлена автоустановка игры Saturn (спасибо Dervart)
 * добавлена возможность выбора темной/светлой темы в глобальных настройках PP (спасибо Htylol)
diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper
index 78c998d..d4414d6 100755
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -1369,7 +1369,7 @@ recommend_dpi () {
         echo "disabled"
         return 1
     fi
-    local dpi=$(( height / 10 ))
+    local dpi=$(( height / 11 ))
     (( dpi < 96 )) && local dpi="96"
     echo "$dpi"
 }
@@ -5730,7 +5730,7 @@ gui_userconf () {
     "${pw_yad}" --plug=$KEY_USERCONF_GUI --tabnum="2" --form --columns=1 --separator="%" --homogeneous-row \
     --gui-type-text="$PANED_GUI_TYPE_TEXT_DOWN" --gui-type-layout="$PANED_GUI_TYPE_LAYOUT_DOWN" \
     --field="${translations[Choose a graphics card to run the game]}!${translations[Select which video card will be used to run the game (used for all running games and programs in PortProton)]} :CB" "$(combobox_fix --disabled "$GPU_VAR" "$GET_GPU_NAMES")" \
-    --field="${translations[Force dpi]}!${translations[Here you can set forced dpi for applications wine]} :CB" "$(combobox_fix --disabled "$YAD_DPI_VAR" "${translations[Recommended value]}!96!120!144!168!192!216!240!264!288")" \
+    --field="${translations[Force dpi]}!${translations[Here you can set forced dpi for applications wine]} :CB" "$(combobox_fix --disabled "$YAD_DPI_VAR" "${translations[Recommended value]}!80!96!120!144!168!192!216!240")" \
     --field="${translations[Choice wine audio driver]}!${translations[Fixes sound popling if choice alsa]} :CB" "$(combobox_fix --disabled "$SOUND_DRIVER_VAR" "alsa!oss!pulse")" \
     --field="${translations[Select PortProton theme]}!${translations[Allows you to select a theme for PortProton]} :CB" "$(combobox_fix "$GUI_THEME" "${translations[default]}!${translations[compact]}!${translations[classic]}")" \
     --field="${translations[Select gtk theme]}!${translations[Allows you to select a theme for GTK.]} :CB" "$(combobox_fix "$GTK_THEME" "${YAD_GTK_THEME}Adwaita:${translations[light]}!Adwaita:${translations[dark]}!${translations[default]}")" \
diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh
index dc379dc..de0f607 100755
--- a/data_from_portwine/scripts/start.sh
+++ b/data_from_portwine/scripts/start.sh
@@ -245,10 +245,11 @@ if [[ ! $PW_GUI_START =~ (PANED|NOTEBOOK) ]] ; then
 fi
 
 # TODO:fixes_after_update
-if fixes_after_update "2371: Reset PW_WINE_DPI_VALUE in user.conf" ; then
+if fixes_after_update "2372: Reset PW_WINE_DPI_VALUE in user.conf" ; then
     sed -i '/export PW_WINE_DPI_VALUE=/d' "$USER_CONF"
     unset PW_WINE_DPI_VALUE
 fi
+
 # choose wine dpi default
 if [[ -z $PW_WINE_DPI_VALUE ]] ; then
     echo 'export PW_WINE_DPI_VALUE="recommended"' >> "$USER_CONF"