From 58ea082bd55de9aeece2151beeca310bf7301ca8 Mon Sep 17 00:00:00 2001 From: pelya Date: Mon, 17 Sep 2012 15:57:43 +0300 Subject: [PATCH] Do not show "Change device config" button at all, if startup button timeout is 0 --- project/java/MainActivity.java | 35 ++++++++++--------- .../jni/application/ballfield/ballfield.cpp | 4 +-- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/project/java/MainActivity.java b/project/java/MainActivity.java index e12878fa8..2eea706ee 100644 --- a/project/java/MainActivity.java +++ b/project/java/MainActivity.java @@ -97,26 +97,29 @@ public class MainActivity extends Activity _layout2 = new LinearLayout(this); _layout2.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)); - _btn = new Button(this); - _btn.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)); - _btn.setText(getResources().getString(R.string.device_change_cfg)); - class onClickListener implements View.OnClickListener + if( Globals.StartupMenuButtonTimeout > 0 ) { - public MainActivity p; - onClickListener( MainActivity _p ) { p = _p; } - public void onClick(View v) - { - setUpStatusLabel(); - System.out.println("libSDL: User clicked change phone config button"); - Settings.showConfig(p, false); - } - }; - _btn.setOnClickListener(new onClickListener(this)); + _btn = new Button(this); + _btn.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)); + _btn.setText(getResources().getString(R.string.device_change_cfg)); + class onClickListener implements View.OnClickListener + { + public MainActivity p; + onClickListener( MainActivity _p ) { p = _p; } + public void onClick(View v) + { + setUpStatusLabel(); + System.out.println("libSDL: User clicked change phone config button"); + Settings.showConfig(p, false); + } + }; + _btn.setOnClickListener(new onClickListener(this)); - _layout2.addView(_btn); + _layout2.addView(_btn); + } _layout.addView(_layout2); - + ImageView img = new ImageView(this); img.setScaleType(ImageView.ScaleType.FIT_CENTER /* FIT_XY */ ); diff --git a/project/jni/application/ballfield/ballfield.cpp b/project/jni/application/ballfield/ballfield.cpp index 6097a0daf..0a5e065df 100644 --- a/project/jni/application/ballfield/ballfield.cpp +++ b/project/jni/application/ballfield/ballfield.cpp @@ -602,8 +602,8 @@ int main(int argc, char* argv[]) r.x = SCREEN_W/2 + screenjoy[0] * SCREEN_H / 65536; r.y = SCREEN_H/2 + screenjoy[1] * SCREEN_H / 65536; //__android_log_print(ANDROID_LOG_INFO, "Ballfield", "Screen joystick: %d %d screen %d %d", screenjoy[0], screenjoy[1], r.x, r.y); - r.w = 6; - r.h = 6; + r.w = 10; + r.h = 10; r.x -= r.w/2; r.y -= r.h/2; SDL_FillRect(screen, &r, 0x000000);