From 766a445e36f8ad3f1823adfb7f3bfa96cf89a30b Mon Sep 17 00:00:00 2001
From: zhaodengke <beyondk2000@gmail.com>
Date: Fri, 19 Jul 2024 13:32:29 +0800
Subject: [PATCH] 1.1.0harmattan53

---
 Q3E/src/main/jni/deplibs/CMakeLists.txt       |  2 +-
 .../src/main/res/layout/launcher_tab3.xml     | 33 +++++++++++--------
 idTech4Amm/src/main/res/values-ru/strings.xml |  2 +-
 idTech4Amm/src/main/res/values-zh/strings.xml |  2 +-
 idTech4Amm/src/main/res/values/strings.xml    |  2 +-
 5 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/Q3E/src/main/jni/deplibs/CMakeLists.txt b/Q3E/src/main/jni/deplibs/CMakeLists.txt
index 8370b6416..fbb428bfa 100644
--- a/Q3E/src/main/jni/deplibs/CMakeLists.txt
+++ b/Q3E/src/main/jni/deplibs/CMakeLists.txt
@@ -36,7 +36,7 @@ add_subdirectory (libsndfile) # -1.2.2
 add_subdirectory (fluidsynth)
 #add_subdirectory(fluidsynth-lite)
 
-add_subdirectory (etc2comp/EtcLib)
+#add_subdirectory (etc2comp/EtcLib)
 
 #add_subdirectory (ktx) # KTX-Software-3.0.1
 
diff --git a/idTech4Amm/src/main/res/layout/launcher_tab3.xml b/idTech4Amm/src/main/res/layout/launcher_tab3.xml
index 3b949389b..7e1c9b21a 100644
--- a/idTech4Amm/src/main/res/layout/launcher_tab3.xml
+++ b/idTech4Amm/src/main/res/layout/launcher_tab3.xml
@@ -135,36 +135,41 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginRight="5dp"
-                android:text="@string/scale_with_screen_aspect_ratio" />
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
                 <TextView
-                    android:layout_width="0dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0.33"
                     android:layout_gravity="center_vertical"
-                    android:gravity="left"
-                    android:text="10%" />
+                    android:layout_marginRight="5dp"
+                    android:text="@string/scale_with_screen_aspect_ratio" />
                 <TextView
                     android:id="@+id/tv_scale_current"
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0.34"
                     android:layout_gravity="center_vertical"
-                    android:gravity="center"
                     android:textColor="#FF000000"
                     android:text="100%" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.5"
+                    android:layout_gravity="center_vertical"
+                    android:gravity="left"
+                    android:text="10%" />
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0.33"
+                    android:layout_weight="0.5"
                     android:layout_gravity="center_vertical"
                     android:gravity="right"
                     android:text="200%" />
diff --git a/idTech4Amm/src/main/res/values-ru/strings.xml b/idTech4Amm/src/main/res/values-ru/strings.xml
index 67d821699..6205b429a 100644
--- a/idTech4Amm/src/main/res/values-ru/strings.xml
+++ b/idTech4Amm/src/main/res/values-ru/strings.xml
@@ -332,7 +332,7 @@
     <string name="game_datas_standalone_directories">Отдельные каталоги игр</string>
     <string name="fullscreen">Полный экран</string>
     <string name="scale_by_screen_width_height">Масштабировать по ширине/высоте экрана</string>
-    <string name="scale_with_screen_aspect_ratio">Масштабировать с учетом соотношения сторон экрана</string>
+    <string name="scale_with_screen_aspect_ratio">Масштабировать с учетом соотношения сторон экрана: </string>
     <string name="_scale_by_screen_area">Масштабировать по площади экрана</string>
     <string name="freedoom1_base">FreeDOOM 1</string>
     <string name="freedoom2_base">FreeDOOM 2</string>
diff --git a/idTech4Amm/src/main/res/values-zh/strings.xml b/idTech4Amm/src/main/res/values-zh/strings.xml
index d52ecfaa8..5448ed436 100644
--- a/idTech4Amm/src/main/res/values-zh/strings.xml
+++ b/idTech4Amm/src/main/res/values-zh/strings.xml
@@ -331,7 +331,7 @@
     <string name="game_datas_standalone_directories">游戏独立文件夹</string>
     <string name="fullscreen">全屏</string>
     <string name="scale_by_screen_width_height">按屏幕宽高比例</string>
-    <string name="scale_with_screen_aspect_ratio">屏幕分辨率宽高比缩放</string>
+    <string name="scale_with_screen_aspect_ratio">屏幕分辨率宽高比缩放: </string>
     <string name="_scale_by_screen_area">按屏幕面积比例</string>
     <string name="freedoom1_base">FreeDOOM 1</string>
     <string name="freedoom2_base">FreeDOOM 2</string>
diff --git a/idTech4Amm/src/main/res/values/strings.xml b/idTech4Amm/src/main/res/values/strings.xml
index 71e207828..38dd492f8 100644
--- a/idTech4Amm/src/main/res/values/strings.xml
+++ b/idTech4Amm/src/main/res/values/strings.xml
@@ -334,7 +334,7 @@
     <string name="game_datas_standalone_directories">Game standalone directories</string>
     <string name="fullscreen">Fullscreen</string>
     <string name="scale_by_screen_width_height">Scale by screen width/height</string>
-    <string name="scale_with_screen_aspect_ratio">Scale with screen aspect ratio</string>
+    <string name="scale_with_screen_aspect_ratio">Scale with screen aspect ratio: </string>
     <string name="_scale_by_screen_area">Scale by screen area</string>
     <string name="freedoom1_base">FreeDOOM 1</string>
     <string name="freedoom2_base">FreeDOOM 2</string>