Option to disable finger hover in SDL settings

This commit is contained in:
pelya
2014-04-24 00:17:07 +03:00
parent 7271e8c1f4
commit 47ae380720
8 changed files with 13 additions and 5 deletions

View File

@@ -109,10 +109,11 @@ class Globals
public static int RelativeMouseMovementSpeed = 2;
public static int RelativeMouseMovementAccel = 0;
public static int ShowScreenUnderFinger = Mouse.ZOOM_NONE;
public static boolean KeepAspectRatio = KeepAspectRatioDefaultSetting;
public static int ClickScreenPressure = 0;
public static int ClickScreenTouchspotSize = 0;
public static boolean FingerHover = true;
public static boolean HoverJitterFilter = true;
public static boolean KeepAspectRatio = KeepAspectRatioDefaultSetting;
public static int RemapHwKeycode[] = new int[SDL_Keys.JAVA_KEYCODE_LAST];
public static int RemapScreenKbKeycode[] = new int[6];
public static int ScreenKbControlsLayout[][] = AppUsesThirdJoystick ? // Values for 800x480 resolution

View File

@@ -175,6 +175,7 @@ class Settings
out.writeBoolean(Globals.HoverJitterFilter);
out.writeBoolean(Globals.MoveMouseWithGyroscope);
out.writeInt(Globals.MoveMouseWithGyroscopeSpeed);
out.writeBoolean(Globals.FingerHover);
out.close();
settingsLoaded = true;
@@ -361,6 +362,7 @@ class Settings
Globals.HoverJitterFilter = settingsFile.readBoolean();
Globals.MoveMouseWithGyroscope = settingsFile.readBoolean();
Globals.MoveMouseWithGyroscopeSpeed = settingsFile.readInt();
Globals.FingerHover = settingsFile.readBoolean();
settingsLoaded = true;

View File

@@ -419,6 +419,7 @@ class SettingsMenuMouse extends SettingsMenu
p.getResources().getString(R.string.click_with_dpadcenter),
p.getResources().getString(R.string.mouse_relative),
p.getResources().getString(R.string.mouse_gyroscope_mouse),
p.getResources().getString(R.string.mouse_finger_hover),
};
boolean defaults[] = {
@@ -427,6 +428,7 @@ class SettingsMenuMouse extends SettingsMenu
Globals.ClickMouseWithDpad,
Globals.RelativeMouseMovement,
Globals.MoveMouseWithGyroscope,
Globals.FingerHover,
};
@@ -446,6 +448,8 @@ class SettingsMenuMouse extends SettingsMenu
Globals.RelativeMouseMovement = isChecked;
if( item == 4 )
Globals.MoveMouseWithGyroscope = isChecked;
if( item == 5 )
Globals.FingerHover = isChecked;
}
});
builder.setPositiveButton(p.getResources().getString(R.string.ok), new DialogInterface.OnClickListener()

View File

@@ -556,7 +556,7 @@ abstract class DifferentTouchInput
if( Globals.AppUsesMouse )
Toast.makeText(MainActivity.instance, "Finger hover capability detected", Toast.LENGTH_SHORT).show();
// Switch away from relative mouse input
if( Globals.RelativeMouseMovement || Globals.LeftClickMethod != Mouse.LEFT_CLICK_NORMAL )
if( Globals.FingerHover && (Globals.RelativeMouseMovement || Globals.LeftClickMethod != Mouse.LEFT_CLICK_NORMAL) )
{
if( Globals.RelativeMouseMovement )
Globals.ShowScreenUnderFinger = Mouse.ZOOM_MAGNIFIER;

View File

@@ -111,6 +111,7 @@
<string name="mouse_hover_jitter_filter">Filter jitter for stylus/finger hover</string>
<string name="mouse_gyroscope_mouse">Control mouse with gyroscope</string>
<string name="mouse_gyroscope_mouse_sensitivity">Gyroscope sensitivity</string>
<string name="mouse_finger_hover">Finger hover</string>
<string name="none">None</string>