ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle the core popUp directly, but pass others to handler

This commit is contained in:
TwistedUmbrella 2014-02-13 03:18:57 -05:00
parent c3a7260dc1
commit fd69686f78
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java
View File

@ -564,7 +564,9 @@ public class GL2JNIActivity extends Activity {
if (!popUp.isShowing()) { if (!popUp.isShowing()) {
displayPopUp(popUp); displayPopUp(popUp);
} else { } else {
menu.dismissPopUps(); if (!menu.dismissPopUps()) {
popUp.dismiss();
}
} }
return true; return true;
} }

5
shell/android/src/com/reicast/emulator/emu/OnScreenMenu.java
View File

@ -98,7 +98,6 @@ public class OnScreenMenu {
// layout.addView(hlay,params); // layout.addView(hlay,params);
popUp.setContentView(hlay); popUp.setContentView(hlay);
popups.add(popUp);
return popUp; return popUp;
} }
@ -296,13 +295,15 @@ public class OnScreenMenu {
} }
} }
public void dismissPopUps() { public boolean dismissPopUps() {
for (PopupWindow popup : popups) { for (PopupWindow popup : popups) {
if (popup.isShowing()) { if (popup.isShowing()) {
popup.dismiss(); popup.dismiss();
popups.remove(popup); popups.remove(popup);
return true;
} }
} }
return false;
} }
public static int getPixelsFromDp(float dps, Context context) { public static int getPixelsFromDp(float dps, Context context) {