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

Merge pull request #468 from LoungeKatt/master 

Remove some test changes, Use drawable swap function
This commit is contained in:
MrPsyMan 2014-05-09 22:05:38 +03:00
parent c01fad3f61 6ad8c9ac11
commit aaf23eae46
1 changed files with 7 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,8 +129,8 @@ public class OnScreenMenu {
LinearLayout hlay = new LinearLayout(mContext); LinearLayout hlay = new LinearLayout(mContext);
// hlay.setOrientation(LinearLayout.HORIZONTAL); hlay.setOrientation(LinearLayout.HORIZONTAL);
hlay.setOrientation(LinearLayout.VERTICAL); // hlay.setOrientation(LinearLayout.VERTICAL);
hlay.addView(addbut(R.drawable.up, "Back", new OnClickListener() { hlay.addView(addbut(R.drawable.up, "Back", new OnClickListener() {
public void onClick(View v) { public void onClick(View v) {
@ -206,8 +206,8 @@ public class OnScreenMenu {
LinearLayout hlay = new LinearLayout(mContext); LinearLayout hlay = new LinearLayout(mContext);
// hlay.setOrientation(LinearLayout.HORIZONTAL); hlay.setOrientation(LinearLayout.HORIZONTAL);
hlay.setOrientation(LinearLayout.VERTICAL); // hlay.setOrientation(LinearLayout.VERTICAL);
View up = addbut(R.drawable.up, "Back", new OnClickListener() { View up = addbut(R.drawable.up, "Back", new OnClickListener() {
public void onClick(View v) { public void onClick(View v) {
@ -222,21 +222,15 @@ public class OnScreenMenu {
if (screen) { if (screen) {
JNIdc.widescreen(0); JNIdc.widescreen(0);
screen = false; screen = false;
// ((ImageButton) fullscreen)
// .setImageResource(R.drawable.widescreen);
modbut(fullscreen, R.drawable.widescreen); modbut(fullscreen, R.drawable.widescreen);
} else { } else {
JNIdc.widescreen(1); JNIdc.widescreen(1);
screen = true; screen = true;
// ((ImageButton) fullscreen)
// .setImageResource(R.drawable.normal_view);
modbut(fullscreen, R.drawable.normal_view); modbut(fullscreen, R.drawable.normal_view);
} }
} }
}); });
if (screen) { if (screen) {
// ((ImageButton) fullscreen)
// .setImageResource(R.drawable.normal_view);
modbut(fullscreen, R.drawable.normal_view); modbut(fullscreen, R.drawable.normal_view);
} }
@ -274,21 +268,15 @@ public class OnScreenMenu {
if (limit) { if (limit) {
JNIdc.limitfps(0); JNIdc.limitfps(0);
limit = false; limit = false;
// ((ImageButton) framelimit)
// .setImageResource(R.drawable.frames_limit_on);
modbut(framelimit, R.drawable.frames_limit_on); modbut(framelimit, R.drawable.frames_limit_on);
} else { } else {
JNIdc.limitfps(1); JNIdc.limitfps(1);
limit = true; limit = true;
// ((ImageButton) framelimit)
// .setImageResource(R.drawable.frames_limit_off);
modbut(framelimit, R.drawable.frames_limit_off); modbut(framelimit, R.drawable.frames_limit_off);
} }
} }
}); });
if (limit) { if (limit) {
// ((ImageButton) framelimit)
// .setImageResource(R.drawable.frames_limit_off);
modbut(framelimit, R.drawable.frames_limit_off); modbut(framelimit, R.drawable.frames_limit_off);
} }
hlay.addView(framelimit, params); hlay.addView(framelimit, params);
@ -307,8 +295,6 @@ public class OnScreenMenu {
.audioDisable(true); .audioDisable(true);
} }
audio = false; audio = false;
// ((ImageButton) audiosetting)
// .setImageResource(R.drawable.enable_sound);
modbut(audiosetting, R.drawable.enable_sound); modbut(audiosetting, R.drawable.enable_sound);
} else { } else {
if (mContext instanceof GL2JNINative) { if (mContext instanceof GL2JNINative) {
@ -320,15 +306,11 @@ public class OnScreenMenu {
.audioDisable(false); .audioDisable(false);
} }
audio = true; audio = true;
// ((ImageButton) audiosetting)
// .setImageResource(R.drawable.mute_sound);
modbut(audiosetting, R.drawable.mute_sound); modbut(audiosetting, R.drawable.mute_sound);
} }
} }
}); });
if (audio) { if (audio) {
// ((ImageButton) audiosetting)
// .setImageResource(R.drawable.mute_sound);
modbut(audiosetting, R.drawable.mute_sound); modbut(audiosetting, R.drawable.mute_sound);
} }
if (!masteraudio) { if (!masteraudio) {
@ -362,8 +344,6 @@ public class OnScreenMenu {
.fastForward(false); .fastForward(false);
} }
boosted = false; boosted = false;
// ((ImageButton) fastforward)
// .setImageResource(R.drawable.star);
modbut(fastforward, R.drawable.star); modbut(fastforward, R.drawable.star);
} else { } else {
if (mContext instanceof GL2JNINative) { if (mContext instanceof GL2JNINative) {
@ -387,14 +367,11 @@ public class OnScreenMenu {
((GL2JNIActivity) mContext).mView.fastForward(true); ((GL2JNIActivity) mContext).mView.fastForward(true);
} }
boosted = true; boosted = true;
// ((ImageButton) fastforward)
// .setImageResource(R.drawable.reset);
modbut(fastforward, R.drawable.reset); modbut(fastforward, R.drawable.reset);
} }
} }
}); });
if (boosted) { if (boosted) {
// ((ImageButton) fastforward).setImageResource(R.drawable.reset);
modbut(fastforward, R.drawable.reset); modbut(fastforward, R.drawable.reset);
} }
hlay.addView(fastforward, params); hlay.addView(fastforward, params);
@ -476,7 +453,7 @@ public class OnScreenMenu {
Drawable image = mContext.getResources().getDrawable(x); Drawable image = mContext.getResources().getDrawable(x);
image.setBounds(0, 0, 72, 72); image.setBounds(0, 0, 72, 72);
but.setCompoundDrawables(image, null, null, null); but.setCompoundDrawables(image, null, null, null);
but.setText(l); // but.setText(l);
but.setOnClickListener(ocl); but.setOnClickListener(ocl);
return but; return but;
@ -529,8 +506,8 @@ public class OnScreenMenu {
int p = getPixelsFromDp(72, mContext); int p = getPixelsFromDp(72, mContext);
params = new LayoutParams(LayoutParams.WRAP_CONTENT, p); params = new LayoutParams(LayoutParams.WRAP_CONTENT, p);
hlay = new LinearLayout(mContext); hlay = new LinearLayout(mContext);
// hlay.setOrientation(LinearLayout.HORIZONTAL); hlay.setOrientation(LinearLayout.HORIZONTAL);
hlay.setOrientation(LinearLayout.VERTICAL); // hlay.setOrientation(LinearLayout.VERTICAL);
int vpX = getPixelsFromDp(72, mContext); int vpX = getPixelsFromDp(72, mContext);
int vpY = getPixelsFromDp(52, mContext); int vpY = getPixelsFromDp(52, mContext);
@ -570,23 +547,17 @@ public class OnScreenMenu {
prefs.edit() prefs.edit()
.putBoolean(Gamepad.pref_js_rbuttons, .putBoolean(Gamepad.pref_js_rbuttons,
false).commit(); false).commit();
// ((ImageButton) rsticksetting)
// .setImageResource(R.drawable.toggle_a_b);
modbut(rsticksetting, R.drawable.toggle_a_b); modbut(rsticksetting, R.drawable.toggle_a_b);
} else { } else {
prefs.edit() prefs.edit()
.putBoolean(Gamepad.pref_js_rbuttons, .putBoolean(Gamepad.pref_js_rbuttons,
true).commit(); true).commit();
// ((ImageButton) rsticksetting)
// .setImageResource(R.drawable.toggle_r_l);
modbut(rsticksetting, R.drawable.toggle_r_l); modbut(rsticksetting, R.drawable.toggle_r_l);
} }
dismiss(); dismiss();
} }
}); });
if (prefs.getBoolean(Gamepad.pref_js_rbuttons, true)) { if (prefs.getBoolean(Gamepad.pref_js_rbuttons, true)) {
// ((ImageButton) rsticksetting)
// .setImageResource(R.drawable.toggle_r_l);
modbut(rsticksetting, R.drawable.toggle_r_l); modbut(rsticksetting, R.drawable.toggle_r_l);
} }
hlay.addView(rsticksetting, params); hlay.addView(rsticksetting, params);