Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2025-01-13 12:31:25 +00:00
Code Issues Projects Releases Wiki Activity

Check if parent view exists as proxy for isShowing

Browse Source
This commit is contained in:
Aaron Culliney 2015-10-25 21:48:41 -07:00
parent 844d8b815b
commit 38dce3e212
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2AbstractMenu.java
View File

@ -43,7 +43,7 @@ public abstract class Apple2AbstractMenu implements Apple2MenuView {
setup();
}
public synchronized void show() {
public void show() {
if (isShowing()) {
return;
}
@ -59,7 +59,7 @@ public abstract class Apple2AbstractMenu implements Apple2MenuView {
}
public boolean isShowing() {
return mSettingsView.isShown();
return mSettingsView.getParent() != null;
}
public View getView() {

5
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Activity.java
View File

@ -582,8 +582,9 @@ public class Apple2Activity extends Activity {
// Actually remove View from view hierarchy
{
View menuView = apple2MenuView.getView();
if (menuView.isShown()) {
((ViewGroup) menuView.getParent()).removeView(menuView);
ViewGroup viewGroup = (ViewGroup) menuView.getParent();
if (viewGroup != null) {
viewGroup.removeView(menuView);
}
if (apple2MenuView == mSplashScreen) {
mSplashScreen = null;

2
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2DisksMenu.java
View File

@ -184,7 +184,7 @@ public class Apple2DisksMenu implements Apple2MenuView {
}
public boolean isShowing() {
return mDisksView.isShown();
return mDisksView.getParent() != null;
}
public View getView() {

2
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2JoystickCalibration.java
View File

@ -114,7 +114,7 @@ public class Apple2JoystickCalibration implements Apple2MenuView {
}
public boolean isShowing() {
return mSettingsView.isShown();
return mSettingsView.getParent() != null;
}
public View getView() {

2
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2KeypadChooser.java
View File

@ -119,7 +119,7 @@ public class Apple2KeypadChooser implements Apple2MenuView {
}
public boolean isShowing() {
return mSettingsView.isShown();
return mSettingsView.getParent() != null;
}
public View getView() {

4
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SplashScreen.java
View File

@ -71,7 +71,7 @@ public class Apple2SplashScreen implements Apple2MenuView {
/* ... */
}
public synchronized void show() {
public void show() {
if (isShowing()) {
return;
}
@ -87,7 +87,7 @@ public class Apple2SplashScreen implements Apple2MenuView {
}
public boolean isShowing() {
return mSettingsView.isShown();
return mSettingsView.getParent() != null;
}
public View getView() {