From 3fba4ab3a0e2249d5784badcb0b79dbb9c592b8d Mon Sep 17 00:00:00 2001
From: khanhduytran0 <khanhduytran032@gmail.com>
Date: Wed, 2 Dec 2020 16:37:46 +0700
Subject: [PATCH] [Feature request] Customizable mouse size

---
 .../net/kdt/pojavlaunch/BaseMainActivity.java |  9 +++++++++
 .../prefs/LauncherPreferenceFragment.java     |  6 ++++++
 .../prefs/LauncherPreferences.java            |  4 +++-
 app/src/main/res/values/strings.xml           |  3 +++
 app/src/main/res/xml/pref_main.xml            | 20 ++++++++++++++-----
 5 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java b/app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
index 2cf582fe5..b2f640569 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
@@ -171,6 +171,15 @@ public class BaseMainActivity extends LoggableActivity {
             //this.mouseToggleButton = findButton(R.id.control_togglemouse);
             this.touchPad = (LinearLayout) findViewById(R.id.main_touchpad);
             this.mousePointer = (ImageView) findViewById(R.id.main_mouse_pointer);
+            this.mousePointer.post(new Runnable(){
+
+                @Override
+                public void run() {
+                    ViewGroup.LayoutParams params = mousePointer.getLayoutParams();
+                    params.width = (int) (mousePointer.getWidth() / 100f * LauncherPreferences.PREF_MOUSESCALE);
+                    params.height = (int) (mousePointer.getHeight() / 100f * LauncherPreferences.PREF_MOUSESCALE);
+                }
+            });
 
             this.contentLog = (LinearLayout) findViewById(R.id.content_log_layout);
             this.contentScroll = (ScrollView) findViewById(R.id.content_log_scroll);
diff --git a/app/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferenceFragment.java b/app/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferenceFragment.java
index 53f5b3249..8bc51382d 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferenceFragment.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferenceFragment.java
@@ -25,6 +25,12 @@ public class LauncherPreferenceFragment extends PreferenceFragmentCompat
         seek3.setMin(20);
         seek3.setMax(500);
 		seek3.setValue((int) LauncherPreferences.PREF_BUTTONSIZE);
+        
+        SeekBarPreference seek4 = (SeekBarPreference) findPreference("mousescale");
+        seek4.setMin(20);
+        seek4.setMax(500);
+        seek4.setValue((int) LauncherPreferences.PREF_MOUSESCALE);
+        
 	}
 
     @Override
diff --git a/app/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java b/app/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java
index cebb95cce..1793a35f5 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java
@@ -12,7 +12,8 @@ public class LauncherPreferences
 	public static boolean PREF_VERTYPE_OLDALPHA = false;
 	public static boolean PREF_VERTYPE_OLDBETA = false;
 	public static boolean PREF_FREEFORM = false;
-	public static float PREF_BUTTONSIZE = 1.0f;
+	public static float PREF_BUTTONSIZE = 100f;
+	public static float PREF_MOUSESCALE = 100f;
 	public static int PREF_LONGPRESS_TRIGGER = 500;
 	public static String PREF_DEFAULTCTRL_PATH = Tools.CTRLDEF_FILE;
 	public static String PREF_CUSTOM_JAVA_ARGS;
@@ -21,6 +22,7 @@ public class LauncherPreferences
 	
 	public static void loadPreferences() {
 		PREF_BUTTONSIZE = DEFAULT_PREF.getInt("buttonscale", 100);
+		PREF_MOUSESCALE = DEFAULT_PREF.getInt("mousescale", 100);
 		PREF_FREEFORM = DEFAULT_PREF.getBoolean("freeform", false);
 		PREF_VERTYPE_RELEASE = DEFAULT_PREF.getBoolean("vertype_release", true);
 		PREF_VERTYPE_SNAPSHOT = DEFAULT_PREF.getBoolean("vertype_snapshot", false);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3bf03db43..99c4a9384 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -99,10 +99,13 @@
     <string name="mcl_setting_subtitle_longpresstrigger">Change trigger time for long press in destroy block and drop item.</string>
     <string name="mcl_setting_title_buttonscale">Control buttons scaling</string>
     <string name="mcl_setting_subtitle_buttonscale">Upscale them if buttons are too small.</string>
+    <string name="mcl_setting_title_mousescale">Mouse scaling</string>
+    <string name="mcl_setting_subtitle_mousescale">Change size of virtual mouse.</string>
     <string name="mcl_setting_title_controlsize">Set control buttons size</string>
     <string name="mcl_setting_title_javaargs">JVM Launch arguments</string>
     <string name="mcl_setting_subtitle_javaargs">Be careful, this may make game crash if modified without knowledge.</string>
     <string name="mcl_setting_category_general">General settings</string>
+    <string name="mcl_setting_category_scaling">Scaling settings</string>
     <string name="mcl_setting_category_veroption">Version type will be in version list</string>
     <string name="mcl_setting_veroption_release">Release</string>
     <string name="mcl_setting_veroption_snapshot">Snapshot</string>
diff --git a/app/src/main/res/xml/pref_main.xml b/app/src/main/res/xml/pref_main.xml
index bb0b0a269..90cf799b0 100644
--- a/app/src/main/res/xml/pref_main.xml
+++ b/app/src/main/res/xml/pref_main.xml
@@ -15,11 +15,6 @@
             android:title="@string/mcl_setting_title_longpresstrigger"
             android:summary="@string/mcl_setting_subtitle_longpresstrigger" />
 		
-        <android.support.v7.preference.SeekBarPreference
-            android:key="buttonscale"
-            android:title="@string/mcl_setting_title_buttonscale"
-            android:summary="@string/mcl_setting_subtitle_buttonscale" />
-		
         <android.support.v7.preference.SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="freeform"
@@ -35,6 +30,21 @@
 		
     </android.support.v7.preference.PreferenceCategory>
 	
+    <android.support.v7.preference.PreferenceCategory
+        android:title="@string/mcl_setting_category_scaling">
+        
+        <android.support.v7.preference.SeekBarPreference
+            android:key="buttonscale"
+            android:title="@string/mcl_setting_title_buttonscale"
+            android:summary="@string/mcl_setting_subtitle_buttonscale" />
+        
+        <android.support.v7.preference.SeekBarPreference
+            android:key="mousescale"
+            android:title="@string/mcl_setting_title_mousescale"
+            android:summary="@string/mcl_setting_subtitle_mousescale" />
+        
+    </android.support.v7.preference.PreferenceCategory>
+	
     <android.support.v7.preference.PreferenceCategory
 		android:title="@string/mcl_setting_category_veroption">