diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 15f4c70..a53d069 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,9 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2243### Date: 12.01.2024 / Download update size: 8 megabytes +* HOTFIX: Fixed spontaneous prefix switching when using the MANGOHUD configuration interface + ###Scripts version 2242### Date: 11.01.2024 / Download update size: 8 megabytes * added a graphical interface for configuring MANGOHUD (thanks to Boria138) * updated versions: diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 164c2ac..3d461b5 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,9 @@ ----------------------------------------- История изменений: +###Scripts version 2243### Дата: 12.01.2024 / Размер скачиваемого обновления: 8 мегабайт +* HOTFIX: Исправлено самопроизводное переключение префикса при использовании интерфейса настройки MANGOHUD + ###Scripts version 2242### Дата: 11.01.2024 / Размер скачиваемого обновления: 8 мегабайт * добавлен графический интерфейс для настройки MANGOHUD (спасибо Boria138) * обновлены версии: diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index ffb2cdb..f5bd689 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -628,7 +628,7 @@ if [[ -f "${portwine_exe}" ]] ; then --field="PREFIX : :CBE" "${PW_ADD_PREFIXES_TO_GUI}" \ --field=":LBL" "" \ --button="${loc_gui_vkbasalt_start}"!"$PW_GUI_ICON_PATH/separator.png"!"${ENABLE_VKBASALT_INFO}":120 \ - --button="${loc_gui_mh_start}"!"$PW_GUI_ICON_PATH/separator.png"!"${ENABLE_MANGOHUD_INFO}":119 \ + --button="${loc_gui_mh_start}"!"$PW_GUI_ICON_PATH/separator.png"!"${ENABLE_MANGOHUD_INFO}":122 \ --button="${loc_gui_edit_db_start}"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_edit_db} ${PORTWINE_DB}":118 \ --button="${PW_SHORTCUT}" \ --button="${loc_gui_debug}"!"$PW_GUI_ICON_PATH/separator.png"!"${loc_debug}":102 \ @@ -935,7 +935,7 @@ fi open_changelog) open_changelog ;; change_loc) change_loc ;; 120) gui_vkBasalt ;; - 119) gui_MangoHud ;; + 122) gui_MangoHud ;; pw_create_prefix_backup) pw_create_prefix_backup ;; gui_credits) gui_credits ;; pw_start_cont_xterm) pw_start_cont_xterm ;; diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index a2ff583..31676de 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2242 +#SCRIPTS_NEXT_VERSION=2243 ######################################################################## export PW_MANGOHUD=0 export DEFAULT_MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt,gamemode diff --git a/data_from_portwine/scripts/zen_yad_gui b/data_from_portwine/scripts/zen_yad_gui index ef3b0ae..1ac001a 100755 --- a/data_from_portwine/scripts/zen_yad_gui +++ b/data_from_portwine/scripts/zen_yad_gui @@ -493,7 +493,6 @@ gui_vkBasalt () { exit 0 } - gui_MangoHud () { KEY_MH_GUI=$RANDOM LIST_MH=( @@ -547,7 +546,7 @@ gui_MangoHud () { "${pw_yad_v12_3}" --paned --key="$KEY_MH_GUI" --height="650" --title="MangoHud" --center --borders=3 \ --separator=" " --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ --button="$loc_gui_cancel"!!"$loc_gui_cancel_help":1 \ - --button="$loc_gui_disabled_mh"!!"$loc_gui_disabled_mh_help":183 \ + --button="$loc_gui_disabled_mh"!!"$loc_gui_disabled_mh_help":182 \ --button="$loc_gui_save_changes"!!"$loc_gui_save_changes_help":184 2>/dev/null YAD_MANGOHUD_STATUS="$?" @@ -556,8 +555,12 @@ gui_MangoHud () { /usr/bin/env bash -c "${pw_full_command_line[*]}" & exit 0 ;; - 183) + 182) export PW_MANGOHUD=0 + export FPS_LIMIT="disabled" + edit_db_from_gui PW_MANGOHUD FPS_LIMIT + /usr/bin/env bash -c "${pw_full_command_line[*]}" & + exit 0 ;; 184) export PW_MANGOHUD=1 @@ -567,7 +570,7 @@ gui_MangoHud () { YAD_MH_SET=$(<"${PORT_WINE_TMP_PATH}/tmp_yad_mh_set") FPS_LIMIT=$(<"${PORT_WINE_TMP_PATH}/tmp_yad_mh_fps_limit") - if command -v xrand 2>/dev/null ; then + if command -v xrandr 2>/dev/null ; then MONITOR_HEIGHT=$(xrandr | grep -oP 'current\s+\K[0-9]+ x [0-9]+' | awk '{print $3}') MH_FONT_SIZE="font_size=$(expr $MONITOR_HEIGHT / 45)" fi