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

Add a back option to the configuration, Close closes menu

This commit is contained in:
TwistedUmbrella 2014-02-08 21:59:16 -05:00
parent 631b4aaeea
commit b728b0dfb5
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,10 +171,7 @@ public class GL2JNIActivity extends Activity {
hlay.addView(addbut(R.drawable.close, new OnClickListener() {
public void onClick(View v) {
Intent inte = new Intent(GL2JNIActivity.this,
MainActivity.class);
startActivity(inte);
GL2JNIActivity.this.finish();
popUpConfig.dismiss();
}
}), configParams);
View fullscreen;
@ -201,8 +198,10 @@ public class GL2JNIActivity extends Activity {
frameskip = addbut(R.drawable.fast_forward, new OnClickListener() {
public void onClick(View v) {
JNIdc.frameskip((ConfigureFragment.frameskip + 1) * 5);
popUp.dismiss();
popUpConfig.dismiss();
frameskipping = true;
displayConfigPopup();
}
});
} else {
@ -215,6 +214,18 @@ public class GL2JNIActivity extends Activity {
});
}
hlay.addView(frameskip, params);
hlay.addView(addbut(R.drawable.up, new OnClickListener() {
public void onClick(View v) {
popUpConfig.dismiss();
if (MainActivity.force_gpu) {
popUp.showAtLocation(mView6, Gravity.BOTTOM, 0, 0);
} else {
popUp.showAtLocation(mView, Gravity.BOTTOM, 0, 0);
}
popUp.update(LayoutParams.WRAP_CONTENT,
LayoutParams.WRAP_CONTENT);
}
}), configParams);
// layout.addView(hlay,params);
popUpConfig.setContentView(hlay);