From 1b04a74f5c20fa3c657ce154ab513ce22dedd4c5 Mon Sep 17 00:00:00 2001
From: khanhduytran0 <khanhduytran032@gmail.com>
Date: Wed, 2 Dec 2020 05:23:49 +0700
Subject: [PATCH] Custom controls changes - Try to get toggleable option works.
 - [Bug fix] Hidden buttons

---
 .../customcontrols/ControlButton.java            | 16 +++++++---------
 .../customcontrols/ControlLayout.java            |  3 +++
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlButton.java b/app/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlButton.java
index e19f57f32..96f73040b 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlButton.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlButton.java
@@ -174,9 +174,8 @@ public class ControlButton extends Button implements OnLongClickListener, OnTouc
     public boolean onTouch(View view, MotionEvent event) {
         if (!mModifiable) {
             mCanTriggerLongClick = false;
-            
-            // if (!mProperties.isToggle) {
-                if (mProperties.keycode >= 0) {
+            if (mProperties.keycode >= 0) {
+                if (!mProperties.isToggle) {
                     boolean isDown;
                     switch (event.getActionMasked()) {
                         case MotionEvent.ACTION_DOWN: // 0
@@ -192,13 +191,12 @@ public class ControlButton extends Button implements OnLongClickListener, OnTouc
                             return false;
                     }
                     MainActivity.sendKeyPress(mProperties.keycode, mMods, isDown);
-                    return true;
+                } else if (mGestureDetector.onTouchEvent(event)) {
+                    mChecked = !mChecked;
+                    MainActivity.sendKeyPress(mProperties.keycode, mMods, mChecked);
                 }
-            /* } else if (mGestureDetector.onTouchEvent(event)) {
-                mChecked = !mChecked;
-                MainActivity.sendKeyPress(mProperties.keycode, mMods, mChecked);
-            } */
-
+                return true;
+            }
         } else {
             if (mGestureDetector.onTouchEvent(event)) {
                 mCanTriggerLongClick = true;
diff --git a/app/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlLayout.java b/app/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlLayout.java
index 345e5cbc1..c5d4bd9bf 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlLayout.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlLayout.java
@@ -69,6 +69,9 @@ public class ControlLayout extends FrameLayout
 	private void addControlView(ControlData controlButton) {
 		final ControlButton view = new ControlButton(this, controlButton);
 		view.setModifiable(mModifiable);
+        if (!mModifiable) {
+            view.setAlpha(view.getProperties().hidden ? 0f : 1.0f);
+        }
 		addView(view);
 
 		setModified(true);