moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-20 03:23:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix drawing and placement of face buttons

Browse Source
This commit is contained in:
Cameron Gutman 2016-01-20 01:04:06 -05:00
parent 52736f5162
commit 2806aee0fc
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/limelight/binding/input/virtual_controller/DigitalButton.java
View File

@ -150,7 +150,8 @@ public class DigitalButton extends VirtualControllerElement {
paint.setColor(isPressed() ? pressedColor : getDefaultColor()); paint.setColor(isPressed() ? pressedColor : getDefaultColor());
paint.setStyle(Paint.Style.STROKE); paint.setStyle(Paint.Style.STROKE);
canvas.drawRect(1, 1, getWidth() - 1, getHeight() - 1, paint); canvas.drawRect(paint.getStrokeWidth(), paint.getStrokeWidth(),
getWidth() - paint.getStrokeWidth(), getHeight() - paint.getStrokeWidth(), paint);
if (icon != -1) { if (icon != -1) {
Drawable d = getResources().getDrawable(icon); Drawable d = getResources().getDrawable(icon);

27
app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualControllerConfigurationLoader.java
View File

@ -147,6 +147,9 @@ public class VirtualControllerConfigurationLoader {
DisplayMetrics screen = context.getResources().getDisplayMetrics(); DisplayMetrics screen = context.getResources().getDisplayMetrics();
// NOTE: Some of these getPercent() expressions seem like they can be combined
// into a single call. Due to floating point rounding, this isn't actually possible.
controller.addElement(createDigitalPad(controller, context), controller.addElement(createDigitalPad(controller, context),
getPercent(5, screen.widthPixels), getPercent(5, screen.widthPixels),
getPercent(BUTTON_BASE_Y, screen.heightPixels), getPercent(BUTTON_BASE_Y, screen.heightPixels),
@ -156,16 +159,16 @@ public class VirtualControllerConfigurationLoader {
controller.addElement(createDigitalButton( controller.addElement(createDigitalButton(
ControllerPacket.A_FLAG, 0, 1, "A", -1, controller, context), ControllerPacket.A_FLAG, 0, 1, "A", -1, controller, context),
getPercent(BUTTON_BASE_X+BUTTON_WIDTH, screen.widthPixels), getPercent(BUTTON_BASE_X, screen.widthPixels)+getPercent(BUTTON_WIDTH, screen.widthPixels),
getPercent(BUTTON_BASE_Y+2*BUTTON_HEIGHT, screen.heightPixels), getPercent(BUTTON_BASE_Y, screen.heightPixels)+2*getPercent(BUTTON_HEIGHT, screen.heightPixels),
getPercent(BUTTON_WIDTH, screen.widthPixels), getPercent(BUTTON_WIDTH, screen.widthPixels),
getPercent(BUTTON_HEIGHT, screen.heightPixels) getPercent(BUTTON_HEIGHT, screen.heightPixels)
); );
controller.addElement(createDigitalButton( controller.addElement(createDigitalButton(
ControllerPacket.B_FLAG, 0, 1, "B", -1, controller, context), ControllerPacket.B_FLAG, 0, 1, "B", -1, controller, context),
getPercent(BUTTON_BASE_X+2*BUTTON_WIDTH, screen.widthPixels), getPercent(BUTTON_BASE_X, screen.widthPixels)+2*getPercent(BUTTON_WIDTH, screen.widthPixels),
getPercent(BUTTON_BASE_Y+BUTTON_HEIGHT, screen.heightPixels), getPercent(BUTTON_BASE_Y, screen.heightPixels)+getPercent(BUTTON_HEIGHT, screen.heightPixels),
getPercent(BUTTON_WIDTH, screen.widthPixels), getPercent(BUTTON_WIDTH, screen.widthPixels),
getPercent(BUTTON_HEIGHT, screen.heightPixels) getPercent(BUTTON_HEIGHT, screen.heightPixels)
); );
@ -173,21 +176,21 @@ public class VirtualControllerConfigurationLoader {
controller.addElement(createDigitalButton( controller.addElement(createDigitalButton(
ControllerPacket.X_FLAG, 0, 1, "X", -1, controller, context), ControllerPacket.X_FLAG, 0, 1, "X", -1, controller, context),
getPercent(BUTTON_BASE_X, screen.widthPixels), getPercent(BUTTON_BASE_X, screen.widthPixels),
getPercent(BUTTON_BASE_Y+BUTTON_HEIGHT, screen.heightPixels), getPercent(BUTTON_BASE_Y, screen.heightPixels)+getPercent(BUTTON_HEIGHT, screen.heightPixels),
getPercent(BUTTON_WIDTH, screen.widthPixels), getPercent(BUTTON_WIDTH, screen.widthPixels),
getPercent(BUTTON_HEIGHT, screen.heightPixels) getPercent(BUTTON_HEIGHT, screen.heightPixels)
); );
controller.addElement(createDigitalButton( controller.addElement(createDigitalButton(
ControllerPacket.Y_FLAG, 0, 1, "Y", -1, controller, context), ControllerPacket.Y_FLAG, 0, 1, "Y", -1, controller, context),
getPercent(BUTTON_BASE_X+BUTTON_WIDTH, screen.widthPixels), getPercent(BUTTON_BASE_X, screen.widthPixels)+getPercent(BUTTON_WIDTH, screen.widthPixels),
getPercent(BUTTON_BASE_Y, screen.heightPixels), getPercent(BUTTON_BASE_Y, screen.heightPixels),
getPercent(BUTTON_WIDTH, screen.widthPixels), getPercent(BUTTON_WIDTH, screen.widthPixels),
getPercent(BUTTON_HEIGHT, screen.heightPixels) getPercent(BUTTON_HEIGHT, screen.heightPixels)
); );
controller.addElement(createLeftTrigger( controller.addElement(createLeftTrigger(
0, "LT", -1, controller, context), 0, "LT", -1, controller, context),
getPercent(BUTTON_BASE_X, screen.widthPixels), getPercent(BUTTON_BASE_X, screen.widthPixels),
getPercent(BUTTON_BASE_Y, screen.heightPixels), getPercent(BUTTON_BASE_Y, screen.heightPixels),
getPercent(BUTTON_WIDTH, screen.widthPixels), getPercent(BUTTON_WIDTH, screen.widthPixels),
@ -196,7 +199,7 @@ public class VirtualControllerConfigurationLoader {
controller.addElement(createRightTrigger( controller.addElement(createRightTrigger(
0, "RT", -1, controller, context), 0, "RT", -1, controller, context),
getPercent(BUTTON_BASE_X+2*BUTTON_WIDTH, screen.widthPixels), getPercent(BUTTON_BASE_X, screen.widthPixels)+2*getPercent(BUTTON_WIDTH, screen.widthPixels),
getPercent(BUTTON_BASE_Y, screen.heightPixels), getPercent(BUTTON_BASE_Y, screen.heightPixels),
getPercent(BUTTON_WIDTH, screen.widthPixels), getPercent(BUTTON_WIDTH, screen.widthPixels),
getPercent(BUTTON_HEIGHT, screen.heightPixels) getPercent(BUTTON_HEIGHT, screen.heightPixels)
@ -205,15 +208,15 @@ public class VirtualControllerConfigurationLoader {
controller.addElement(createDigitalButton( controller.addElement(createDigitalButton(
ControllerPacket.LB_FLAG, 0, 1, "LB", -1, controller, context), ControllerPacket.LB_FLAG, 0, 1, "LB", -1, controller, context),
getPercent(BUTTON_BASE_X, screen.widthPixels), getPercent(BUTTON_BASE_X, screen.widthPixels),
getPercent(BUTTON_BASE_Y+2*BUTTON_HEIGHT, screen.heightPixels), getPercent(BUTTON_BASE_Y, screen.heightPixels)+2*getPercent(BUTTON_HEIGHT, screen.heightPixels),
getPercent(BUTTON_WIDTH, screen.widthPixels), getPercent(BUTTON_WIDTH, screen.widthPixels),
getPercent(BUTTON_HEIGHT, screen.heightPixels) getPercent(BUTTON_HEIGHT, screen.heightPixels)
); );
controller.addElement(createDigitalButton( controller.addElement(createDigitalButton(
ControllerPacket.RB_FLAG, 0, 1, "RB", -1, controller, context), ControllerPacket.RB_FLAG, 0, 1, "RB", -1, controller, context),
getPercent(BUTTON_BASE_X+2*BUTTON_WIDTH, screen.widthPixels), getPercent(BUTTON_BASE_X, screen.widthPixels)+2*getPercent(BUTTON_WIDTH, screen.widthPixels),
getPercent(BUTTON_BASE_Y+2*BUTTON_HEIGHT, screen.heightPixels), getPercent(BUTTON_BASE_Y, screen.heightPixels)+2*getPercent(BUTTON_HEIGHT, screen.heightPixels),
getPercent(BUTTON_WIDTH, screen.widthPixels), getPercent(BUTTON_WIDTH, screen.widthPixels),
getPercent(BUTTON_HEIGHT, screen.heightPixels) getPercent(BUTTON_HEIGHT, screen.heightPixels)
); );
@ -242,7 +245,7 @@ public class VirtualControllerConfigurationLoader {
controller.addElement(createDigitalButton( controller.addElement(createDigitalButton(
ControllerPacket.PLAY_FLAG, 0, 3, "START", -1, controller, context), ControllerPacket.PLAY_FLAG, 0, 3, "START", -1, controller, context),
getPercent(50, screen.widthPixels), getPercent(40, screen.widthPixels)+getPercent(10, screen.widthPixels),
getPercent(90, screen.heightPixels), getPercent(90, screen.heightPixels),
getPercent(10, screen.widthPixels), getPercent(10, screen.widthPixels),
getPercent(10, screen.heightPixels) getPercent(10, screen.heightPixels)