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

Fix and simplify the new subclassing of the popup menus

This commit is contained in:
TwistedUmbrella 2014-02-09 15:01:05 -05:00
parent e70b71828c
commit ae6d694c52
3 changed files with 35 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,11 +2,9 @@ package com.reicast.emulator;
import android.annotation.TargetApi;
import android.app.Activity;
import android.content.Intent;
import android.content.res.Configuration;
import android.os.Build;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.view.Gravity;
import android.view.KeyEvent;
import android.view.View;
@ -15,7 +13,6 @@ import android.view.ViewGroup.LayoutParams;
import android.view.Window;
import android.widget.ImageButton;
import android.widget.ImageView.ScaleType;
import android.widget.LinearLayout;
import android.widget.PopupWindow;
import android.widget.Toast;
@ -45,7 +42,7 @@ public class EditVJoyActivity extends Activity {
menu = new OnScreenMenu(this);
menu.setGLView(mView, mView6);
popUp = menu.createPopup();
popUp = menu.createVjoyPopup();
// Call parent onCreate()
super.onCreate(icicle);

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

@ -496,6 +496,26 @@ public class GL2JNIActivity extends Activity {
return true;
}
}
public void displayPopUp(PopupWindow popUp) {
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);
}
public void displayConfig(PopupWindow popUpConfig) {
if (MainActivity.force_gpu) {
popUpConfig.showAtLocation(mView6, Gravity.BOTTOM, 0, 0);
} else {
popUpConfig.showAtLocation(mView, Gravity.BOTTOM, 0, 0);
}
popUpConfig.update(LayoutParams.WRAP_CONTENT,
LayoutParams.WRAP_CONTENT);
}
public boolean onKeyUp(int keyCode, KeyEvent event) {
Integer playerNum = Arrays.asList(name).indexOf(event.getDeviceId());
@ -556,14 +576,7 @@ public class GL2JNIActivity extends Activity {
private boolean showMenu() {
if (!popUp.isShowing()) {
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);
displayPopUp(popUp);
} else {
popUp.dismiss();
}

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

@ -18,7 +18,8 @@ import android.widget.ImageView.ScaleType;
public class OnScreenMenu {
private Context mContext;
private GL2JNIActivity mContext;
private EditVJoyActivity vContext;
private SharedPreferences prefs;
LayoutParams params;
private int frameskip;
@ -31,7 +32,7 @@ public class OnScreenMenu {
private File sdcard = Environment.getExternalStorageDirectory();
private String home_directory = sdcard + "/dc";
public OnScreenMenu(Context mContext, SharedPreferences prefs) {
public OnScreenMenu(GL2JNIActivity mContext, SharedPreferences prefs) {
this.mContext = mContext;
this.prefs = prefs;
home_directory = prefs.getString("home_directory", home_directory);
@ -40,8 +41,8 @@ public class OnScreenMenu {
frameskip = ConfigureFragment.frameskip;
}
public OnScreenMenu(Context mContext) {
this.mContext = mContext;
public OnScreenMenu(EditVJoyActivity vContext) {
this.vContext = vContext;
}
public void setGLView(GL2JNIView mView, GL2JNIViewV6 mView6) {
@ -125,19 +126,19 @@ public class OnScreenMenu {
}
PopupWindow createVjoyPopup() {
final PopupWindow popUp = new PopupWindow(mContext);
int p = getPixelsFromDp(60, mContext);
final PopupWindow popUp = new PopupWindow(vContext);
int p = getPixelsFromDp(60, vContext);
params = new LayoutParams(p, p);
LinearLayout hlay = new LinearLayout(mContext);
LinearLayout hlay = new LinearLayout(vContext);
hlay.setOrientation(LinearLayout.HORIZONTAL);
hlay.addView(addbut(R.drawable.apply, new OnClickListener() {
public void onClick(View v) {
Intent inte = new Intent(mContext, MainActivity.class);
mContext.startActivity(inte);
((Activity) mContext).finish();
Intent inte = new Intent(vContext, MainActivity.class);
vContext.startActivity(inte);
((Activity) vContext).finish();
}
}), params);
@ -170,16 +171,10 @@ public class OnScreenMenu {
void displayConfigPopup(final PopupWindow popUp) {
final PopupWindow popUpConfig = new PopupWindow(mContext);
// LinearLayout layout = new LinearLayout(this);
// tv = new TextView(this);
int p = getPixelsFromDp(60, mContext);
LayoutParams configParams = new LayoutParams(p, p);
// layout.setOrientation(LinearLayout.VERTICAL);
// tv.setText("Hi this is a sample text for popup window");
// layout.addView(tv, params);
LinearLayout hlay = new LinearLayout(mContext);
hlay.setOrientation(LinearLayout.HORIZONTAL);
@ -255,28 +250,12 @@ public class OnScreenMenu {
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);
mContext.displayPopUp(popUp);
}
}), configParams);
// layout.addView(hlay,params);
popUpConfig.setContentView(hlay);
if (popUp.isShowing()) {
popUp.dismiss();
}
if (MainActivity.force_gpu) {
popUpConfig.showAtLocation(mView6, Gravity.BOTTOM, 0, 0);
} else {
popUpConfig.showAtLocation(mView, Gravity.BOTTOM, 0, 0);
}
popUpConfig.update(LayoutParams.WRAP_CONTENT,
LayoutParams.WRAP_CONTENT);
mContext.displayConfig(popUpConfig);
}
public static int getPixelsFromDp(float dps, Context context) {