From 650395332e53edbcc0afb8f61edee25f1c9f4dea Mon Sep 17 00:00:00 2001 From: pelya Date: Thu, 6 Jan 2011 08:03:37 +0000 Subject: [PATCH] Saner defaults for on-screen magnifying glass and mouse click methods --- project/java/Globals.java | 6 +++--- project/jni/application/fheroes2/AndroidAppSettings.cfg | 4 ++-- project/jni/application/src | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/project/java/Globals.java b/project/java/Globals.java index ad31c9bf8..eb64e478d 100644 --- a/project/java/Globals.java +++ b/project/java/Globals.java @@ -67,19 +67,19 @@ class Globals { public static final int LEFT_CLICK_WITH_MULTITOUCH = 2; public static final int LEFT_CLICK_WITH_PRESSURE = 3; public static final int LEFT_CLICK_WITH_KEY = 4; - public static int LeftClickMethod = LEFT_CLICK_NORMAL; + public static int LeftClickMethod = AppNeedsTwoButtonMouse ? LEFT_CLICK_NEAR_CURSOR : LEFT_CLICK_NORMAL; public static int LeftClickKey = KeyEvent.KEYCODE_DPAD_CENTER; public static final int RIGHT_CLICK_NONE = 0; public static final int RIGHT_CLICK_WITH_MULTITOUCH = 1; public static final int RIGHT_CLICK_WITH_PRESSURE = 2; public static final int RIGHT_CLICK_WITH_KEY = 3; - public static int RightClickMethod = RIGHT_CLICK_NONE; + public static int RightClickMethod = AppNeedsTwoButtonMouse ? RIGHT_CLICK_WITH_MULTITOUCH : RIGHT_CLICK_NONE; public static int RightClickKey = KeyEvent.KEYCODE_MENU; public static boolean MoveMouseWithJoystick = false; public static int MoveMouseWithJoystickSpeed = 0; public static int MoveMouseWithJoystickAccel = 0; public static boolean ClickMouseWithDpad = false; - public static boolean ShowScreenUnderFinger = false; + public static boolean ShowScreenUnderFinger = AppNeedsTwoButtonMouse; public static boolean KeepAspectRatio = false; public static int ClickScreenPressure = 0; public static int ClickScreenTouchspotSize = 0; diff --git a/project/jni/application/fheroes2/AndroidAppSettings.cfg b/project/jni/application/fheroes2/AndroidAppSettings.cfg index ef9093990..5613658a5 100644 --- a/project/jni/application/fheroes2/AndroidAppSettings.cfg +++ b/project/jni/application/fheroes2/AndroidAppSettings.cfg @@ -22,8 +22,8 @@ AppTouchscreenKeyboardKeysAmount=0 AppTouchscreenKeyboardKeysAmountAutoFire=0 RedefinedKeysScreenKb="LCTRL M T H E C SPACE C S L" MultiABI=n -AppVersionCode=214910 -AppVersionName="2149.10" +AppVersionCode=216711 +AppVersionName="2167.11" CompiledLibraries="sdl_net sdl_mixer sdl_image sdl_ttf png intl" CustomBuildScript=n AppCflags='-finline-functions -O2 -DWITH_ZLIB -DWITH_MIXER -DWITH_XML -DWITH_IMAGE -DWITH_TTF' diff --git a/project/jni/application/src b/project/jni/application/src index 550b7b622..59d41f41e 120000 --- a/project/jni/application/src +++ b/project/jni/application/src @@ -1 +1 @@ -openttd \ No newline at end of file +fheroes2 \ No newline at end of file