From 047a9f6043c4f736e8dc2e5a9eac84add28491e6 Mon Sep 17 00:00:00 2001
From: SerpentSpirale <serpentspirale@gmail.com>
Date: Mon, 19 Jul 2021 09:11:51 +0200
Subject: [PATCH] W.I.P dynamic pointer size according to GUI scale

---
 .../net/kdt/pojavlaunch/BaseMainActivity.java     |   2 ++
 .../customcontrols/gamepad/Gamepad.java           |   6 ++++++
 .../src/main/res/drawable-xhdpi/pointer.png       | Bin 861 -> 0 bytes
 .../src/main/res/drawable/pointer.png             | Bin 0 -> 258 bytes
 .../src/main/res/layout/main_with_customctrl.xml  |   6 +++---
 5 files changed, 11 insertions(+), 3 deletions(-)
 delete mode 100755 app_pojavlauncher/src/main/res/drawable-xhdpi/pointer.png
 create mode 100644 app_pojavlauncher/src/main/res/drawable/pointer.png

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
index f9cd4e271..61626a5ff 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
@@ -934,6 +934,8 @@ public class BaseMainActivity extends LoggableActivity {
         if(scale < this.guiScale || guiScale == 0){
             this.guiScale = scale;
         }
+
+        if(gamepad != null) gamepad.notifyGUISizeChange(this.guiScale);
     }
 
     public int handleGuiBar(int x, int y) {
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/Gamepad.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/Gamepad.java
index 7b5c6d322..e9ecec9ec 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/Gamepad.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/Gamepad.java
@@ -276,6 +276,12 @@ public class Gamepad {
         getCurrentMap().TRIGGER_RIGHT.update(event.getAxisValue(MotionEvent.AXIS_RTRIGGER) > 0.5);
     }
 
+    public void notifyGUISizeChange(int newSize){
+        //Change the pointer size to match UI
+        int size = (int) ((22 * newSize) / gameActivity.scaleFactor);
+        gameActivity.runOnUiThread(() -> pointerView.setLayoutParams(new FrameLayout.LayoutParams(size, size)));
+    }
+
     private GamepadMap getCurrentMap(){
         return currentMap;
     }
diff --git a/app_pojavlauncher/src/main/res/drawable-xhdpi/pointer.png b/app_pojavlauncher/src/main/res/drawable-xhdpi/pointer.png
deleted file mode 100755
index 9a3fceb7649c9944441b7fb16b5313878306b705..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 861
zcmV-j1ETziP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80009dNkl<ZSi{Aa
zJ#O1T5QV=LWjp%uUxKYn7-@5h0BPI>DbwT>X<g+UK11460df-~U=d*9#D*m6mr@G9
zl_wNQQ3e7pFfc80c82fGydApLYQ=M|7SFue@xnQW)Ab&31oU;?23`PNpa-PDcW~Eo
zE$q1}{B4fFO11#Tz_4Ir1-}OO?!mV$+n2@vTP2B=E*EQ{<s2)(dtd8t6oPvTtt&{p
z_fvon!Ykd*fw|rx2bSLZe~<_vlq1k?SP&U-1ugIWG|MuwEW>+$100IAj?ifBR0D^=
zq=Ccq0otVG)=O=X7$);=wXja0*Sv6@^)u@fxL3fLY~C1wSUsy|g<A%1U%yX*k$Em}
zoIoPn8X!<cK~MP~sC$zpov?nBj(WXrg%F&4$`XiM*aTYg*`7cjINlQcqk7+aABy+A
z_g5x?1EUMINvw6?!a2@170ww^iNOb1mX&UnrYRwW55O<r2Dp`eEr6vcS{luJMBr>w
z;r0b<NBs8df&)<#z6#7^;KZnU&+NBGXI+FpU_;^RR+^?8!3`bXDrh`cYsNO6ttsd@
z=Ozyj&+6W?0QYC0<Guf~gU=i3#RwR$5tux3zRT)Vh*I4;QJfrDtPya|wZu(V+Fr?X
z9R<bT3lzN9!TJaI4Gh{955AVRpV|Uat8H*z;(sZwCsM|lx?$@?w2aWm`Cc{z1|ft`
zb#Ew+FBNnwo=3nyd&K=F@vyQK#6xD!v|d-&2gbT;wGG%6JO&<`pi^Vx(jqhnEc9SJ
z)kaEcFD4K|xG1)odGnDtz6I_~0&`=r4HxagM7Df9_F3qmsQrnGv{!Lv&E+>#@EavC
z(mr{dlI+CPE*U77rWWQ!DXux=C#GKRWLu@UU2>=tr`p_{gmW`EmkdixO`(kxd~9dK
z%9(K6(gsUIO>xak+r`#flntg&{xC5~lubEflfb-cDz2P}c33MQ4<VeVY5LPBTuj0y
zuyw+-I?yzMMB31ouAfLR5cjvT_$`zF4+LTz+^a*Tg-(e4Z$;qA6c~}p6%-@kv!)b0
nC4s1zGt(7G$*0+}$wq$xV=RCzxD_C^00000NkvXXu0mjf`ihQX

diff --git a/app_pojavlauncher/src/main/res/drawable/pointer.png b/app_pojavlauncher/src/main/res/drawable/pointer.png
new file mode 100644
index 0000000000000000000000000000000000000000..1bee904a739f64c21e0a75f2ada804ab567a87c9
GIT binary patch
literal 258
zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1quc!RekZjv*f2Z>JdYH7M{f9JJr?@&ELVADPsA
zJy)}It!3)|IEhWMYU!nfEf&wqIOd#VY|&gQ6ZNz0aY^0BPK{@L**mOH<*jg@6fGnD
z;IIJGxr#mC)sCI8`jn(^-RT%`DOz1&X6-KHx4%#CO1iuL!1K0?hj+6+iCOLVWtGa2
z9F-NPr<ZBT$*EtM^8cXs3*FO4vKCk`5!-F>jKM6jezI)8&r+Zh89ZJ6T-G@yGywpc
CVPjbU

literal 0
HcmV?d00001

diff --git a/app_pojavlauncher/src/main/res/layout/main_with_customctrl.xml b/app_pojavlauncher/src/main/res/layout/main_with_customctrl.xml
index ecbeb9517..da94434a0 100644
--- a/app_pojavlauncher/src/main/res/layout/main_with_customctrl.xml
+++ b/app_pojavlauncher/src/main/res/layout/main_with_customctrl.xml
@@ -41,9 +41,9 @@
 
 			<ImageView
 				android:id="@+id/console_pointer"
-				android:visibility="invisible"
-				android:layout_width="64px"
-				android:layout_height="64px"
+				android:visibility="visible"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
 				app:srcCompat="@drawable/pointer" />
 
 		</net.kdt.pojavlaunch.customcontrols.ControlLayout>