From 29605ed6b75e1aabb74dc92b918e404ec811a7ec Mon Sep 17 00:00:00 2001
From: Mathias-Boulay <mathiasboulay@free.fr>
Date: Fri, 29 Nov 2024 18:22:39 +0100
Subject: [PATCH] QoL: make the settings button easier to click

Bigger hitbox, but not visually
---
 .../customcontrols/handleview/DrawerPullButton.java   | 11 +++++------
 .../src/main/res/layout/activity_basemain.xml         |  5 +++--
 .../src/main/res/layout/activity_custom_controls.xml  |  5 +++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/DrawerPullButton.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/DrawerPullButton.java
index fd6fc4714..fb9030752 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/DrawerPullButton.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/DrawerPullButton.java
@@ -16,23 +16,22 @@ public class DrawerPullButton extends View {
     public DrawerPullButton(Context context) {super(context); init();}
     public DrawerPullButton(Context context, @Nullable AttributeSet attrs) {super(context, attrs); init();}
 
-    private final Paint mPaint = new Paint();
+    private final Paint mBackgroundPaint = new Paint();
     private VectorDrawableCompat mDrawable;
 
     private void init(){
         mDrawable = VectorDrawableCompat.create(getContext().getResources(), R.drawable.ic_sharp_settings_24, null);
         setAlpha(0.33f);
+        mBackgroundPaint.setColor(Color.BLACK);
     }
 
     @Override
     protected void onDraw(Canvas canvas) {
-        mPaint.setColor(Color.BLACK);
-        canvas.drawArc(0,-getHeight(),getWidth(), getHeight(), 0, 180, true, mPaint);
+        canvas.drawArc(getPaddingLeft(),-getHeight() + getPaddingBottom(),getWidth() - getPaddingRight(), getHeight() - getPaddingBottom(), 0, 180, true, mBackgroundPaint);
 
-        mPaint.setColor(Color.WHITE);
-        mDrawable.setBounds(0, 0, getHeight(), getHeight());
+        mDrawable.setBounds(getPaddingLeft()/2, getPaddingTop()/2, getHeight() - getPaddingRight()/2, getHeight() - getPaddingBottom()/2);
         canvas.save();
-        canvas.translate((getWidth()-getHeight())/2f, 0);
+        canvas.translate((getWidth()-getHeight())/2f, -getPaddingBottom()/2f);
         mDrawable.draw(canvas);
         canvas.restore();
     }
diff --git a/app_pojavlauncher/src/main/res/layout/activity_basemain.xml b/app_pojavlauncher/src/main/res/layout/activity_basemain.xml
index a7a95d639..bd7f5f7a1 100644
--- a/app_pojavlauncher/src/main/res/layout/activity_basemain.xml
+++ b/app_pojavlauncher/src/main/res/layout/activity_basemain.xml
@@ -51,8 +51,9 @@
 
 			<net.kdt.pojavlaunch.customcontrols.handleview.DrawerPullButton
 				android:id="@+id/drawer_button"
-				android:layout_width="24dp"
-				android:layout_height="12dp"
+				android:layout_width="40dp"
+				android:layout_height="20dp"
+				android:padding="8dp"
 				android:elevation="10dp"
 				android:layout_gravity="center_horizontal"/>
 			<net.kdt.pojavlaunch.customcontrols.mouse.HotbarView
diff --git a/app_pojavlauncher/src/main/res/layout/activity_custom_controls.xml b/app_pojavlauncher/src/main/res/layout/activity_custom_controls.xml
index dcde745bb..2ac37287b 100644
--- a/app_pojavlauncher/src/main/res/layout/activity_custom_controls.xml
+++ b/app_pojavlauncher/src/main/res/layout/activity_custom_controls.xml
@@ -15,8 +15,9 @@
 
 		<net.kdt.pojavlaunch.customcontrols.handleview.DrawerPullButton
 			android:id="@+id/drawer_button"
-			android:layout_width="32dp"
-			android:layout_height="16dp"
+			android:layout_width="40dp"
+			android:layout_height="20dp"
+			android:padding="6dp"
 			android:elevation="10dp"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toStartOf="parent"