TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-13 06:39:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixrs

Browse Source 
- Language script updater script generates wrong output.
- Try to fix OpenGL render surface always focus.
This commit is contained in:
khanhduytran0 2020-11-19 12:08:02 +07:00
parent 856b59fc40
commit 426a316bbd
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
View File

@ -238,7 +238,6 @@ public class BaseMainActivity extends LoggableActivity implements OnTouchListene
pointerSurface.releaseCapture(); // minecraftGLView.releasePointerCapture(); pointerSurface.releaseCapture(); // minecraftGLView.releasePointerCapture();
isCapturing = false; isCapturing = false;
} else if (CallbackBridge.isGrabbing() && !isCapturing) { } else if (CallbackBridge.isGrabbing() && !isCapturing) {
minecraftGLView.requestFocus();
pointerSurface.requestCapture(); // minecraftGLView.requestPointerCapture(); pointerSurface.requestCapture(); // minecraftGLView.requestPointerCapture();
isCapturing = true; isCapturing = true;
} }
@ -315,8 +314,8 @@ public class BaseMainActivity extends LoggableActivity implements OnTouchListene
// System.loadLibrary("Regal"); // System.loadLibrary("Regal");
minecraftGLView.setFocusable(true); minecraftGLView.setFocusable(false);
minecraftGLView.setFocusableInTouchMode(true); minecraftGLView.setFocusableInTouchMode(false);
// minecraftGLView.setEGLContextClientVersion(2); // minecraftGLView.setEGLContextClientVersion(2);
glTouchListener = new OnTouchListener(){ glTouchListener = new OnTouchListener(){
@ -1108,6 +1107,8 @@ public class BaseMainActivity extends LoggableActivity implements OnTouchListene
button.setWidth((int) Tools.dpToPx(this, Tools.pxToDp(this, button.getWidth()) * LauncherPreferences.PREF_BUTTONSIZE)); button.setWidth((int) Tools.dpToPx(this, Tools.pxToDp(this, button.getWidth()) * LauncherPreferences.PREF_BUTTONSIZE));
button.setHeight((int) Tools.dpToPx(this, Tools.pxToDp(this, button.getHeight()) * LauncherPreferences.PREF_BUTTONSIZE)); button.setHeight((int) Tools.dpToPx(this, Tools.pxToDp(this, button.getHeight()) * LauncherPreferences.PREF_BUTTONSIZE));
button.setOnTouchListener(this); button.setOnTouchListener(this);
button.setFocusable(false);
button.setFocusableInTouchMode(false);
return button; return button;
} }
@ -1130,7 +1131,6 @@ public class BaseMainActivity extends LoggableActivity implements OnTouchListene
public void showKeyboard() { public void showKeyboard() {
((InputMethodManager) getSystemService(INPUT_METHOD_SERVICE)).toggleSoftInput(InputMethodManager.SHOW_FORCED, InputMethodManager.HIDE_IMPLICIT_ONLY); ((InputMethodManager) getSystemService(INPUT_METHOD_SERVICE)).toggleSoftInput(InputMethodManager.SHOW_FORCED, InputMethodManager.HIDE_IMPLICIT_ONLY);
minecraftGLView.requestFocus();
} }
private void setRightOverride(boolean val) { private void setRightOverride(boolean val) {

3
scripts/languagelist_updater.sh
View File

@ -4,5 +4,6 @@ THISDIR = `dirname $0`
LANGFILE = $THISDIR/../app/src/main/assets/language_list.txt LANGFILE = $THISDIR/../app/src/main/assets/language_list.txt
rm $LANGFILE rm $LANGFILE
ls $THISDIR/../app/src/main/res/values-* >> $LANGFILE cd $THISDIR/../app/src/main/res
ls | grep values-* >> $LANGFILE