调整[游戏内分辨率缩放]: 使用静态浮点

Vera-Firefly · Oct 18, 2024 · 266be18 · 266be18
1 parent fa15a16
commit 266be18
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/app_pojavlauncher/src/main/java/com/firefly/utils/ResolutionAdjuster.java b/app_pojavlauncher/src/main/java/com/firefly/utils/ResolutionAdjuster.java
@@ -11,30 +11,24 @@
 import android.widget.TextView;
 import android.widget.LinearLayout;
 
-import net.kdt.pojavlaunch.MinecraftGLSurface;
 import net.kdt.pojavlaunch.prefs.LauncherPreferences;
 import net.kdt.pojavlaunch.R;
 import net.kdt.pojavlaunch.Tools;
 
 public class ResolutionAdjuster {
 
-    private float mScaleFactor;
+    private static float mScaleFactor;
     private final Context context;
     private final OnResolutionChangeListener listener;
-    private MinecraftGLSurface glSurface;
 
-    public ResolutionAdjuster(Context context, MinecraftGLSurface glSurface, OnResolutionChangeListener listener) {
+    public ResolutionAdjuster(Context context, OnResolutionChangeListener listener) {
         this.context = context;
-        this.glSurface = glSurface;
         this.listener = listener;
     }
 
     // 显示滑动条弹窗
     public void showSeekBarDialog() {
-        if (glSurface == null) {
-            glSurface = new MinecraftGLSurface(context);
-        }
-        mScaleFactor = glSurface.mScaleFactor;
+        if (mScaleFactor == 0.0f) mScaleFactor = LauncherPreferences.PREF_SCALE_FACTOR / 100f;
         int percentage = Math.round(mScaleFactor * 100);
 
         // 动态创建一个LinearLayout

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java
@@ -224,7 +224,7 @@ protected void initLayout(int resId) {
                         openCustomControls();
                         break;
                     case 6:{
-                        ResolutionAdjuster adjuster = new ResolutionAdjuster(this, minecraftGLView, value -> {
+                        ResolutionAdjuster adjuster = new ResolutionAdjuster(this, value -> {
                             minecraftGLView.refreshSize(value);
                             mHotbarView.refreshScaleFactor(value);
                         });

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MinecraftGLSurface.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MinecraftGLSurface.java
@@ -67,7 +67,7 @@ public class MinecraftGLSurface extends View implements GrabListener {
             .remapDpad(true));
 
     /* Resolution scaler option, allow downsizing a window */
-    public float mScaleFactor = LauncherPreferences.PREF_SCALE_FACTOR / 100f;
+    private float mScaleFactor = LauncherPreferences.PREF_SCALE_FACTOR / 100f;
     /* Sensitivity, adjusted according to screen size */
     private final double mSensitivityFactor = (1.4 * (1080f / Tools.getDisplayMetrics((Activity) getContext()).heightPixels));