Skip to content

Commit 8a38432

Browse files
committed
Reintroduced the space for 4 placement of icons for the fully landscape mode.
1 parent da033d8 commit 8a38432

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

core/src/main/java/emu/jvic/MachineScreen.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -454,12 +454,12 @@ private void draw(float delta) {
454454
} else {
455455
// Normal landscape.
456456
batch.draw(speakerIcon, 16, viewportManager.getHeight() - 112);
457-
batch.draw(pausePlayIcon, 16, (viewportManager.getHeight() - (viewportManager.getHeight() / 6)) - 80);
458-
batch.draw(joystickIcon, 16, (viewportManager.getHeight() / 6) - 16);
459-
batch.draw(keyboardIcon, 16, 16);
460-
batch.draw(fullScreenIcon, viewportManager.getWidth() - 112, viewportManager.getHeight() - 112);
461-
batch.draw(screenSizeIcon, viewportManager.getWidth() - 112, (viewportManager.getHeight() - (viewportManager.getHeight() / 6)) - 80);
457+
batch.draw(pausePlayIcon, 16, (viewportManager.getHeight() - (viewportManager.getHeight() / 3)) - 64);
462458
// Free slot.
459+
batch.draw(keyboardIcon, 16, 0);
460+
batch.draw(fullScreenIcon, viewportManager.getWidth() - 112, viewportManager.getHeight() - 112);
461+
batch.draw(screenSizeIcon, viewportManager.getWidth() - 112, (viewportManager.getHeight() - (viewportManager.getHeight() / 3)) - 64);
462+
batch.draw(joystickIcon, viewportManager.getWidth() - 112, (viewportManager.getHeight() / 3) - 32);
463463
batch.draw(backIcon, viewportManager.getWidth() - 112, 16);
464464
}
465465
} else if (cameraXOffset > 0) {

core/src/main/java/emu/jvic/ui/MachineInputProcessor.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -318,19 +318,19 @@ else if ((touchXY.x > (fiveSixths - 100)) && (touchXY.x < (fiveSixths + 26))) {
318318
} else if (touchXY.x < 112) {
319319
keyboardClicked = true;
320320
}
321-
} else if ((touchXY.y > (viewportManager.getHeight() - (viewportManager.getHeight() / 6)) - 100) &&
322-
(touchXY.y < (viewportManager.getHeight() - (viewportManager.getHeight() / 6)) + 26)) {
321+
} else if ((touchXY.y > (viewportManager.getHeight() - (viewportManager.getHeight() / 3)) - 74) &&
322+
(touchXY.y < (viewportManager.getHeight() - (viewportManager.getHeight() / 3)) + 42)) {
323323
if (touchXY.x > (viewportManager.getWidth() - 112)) {
324324
screenSizeClicked = true;
325325
} else if (touchXY.x < 112) {
326326
pausePlayClicked = true;
327327
}
328-
} else if ((touchXY.y > (viewportManager.getHeight() / 6) - 42) &&
329-
(touchXY.y < (viewportManager.getHeight() / 6) + 84)) {
328+
} else if ((touchXY.y > (viewportManager.getHeight() / 3) - 42) &&
329+
(touchXY.y < (viewportManager.getHeight() / 3) + 74)) {
330330
if (touchXY.x > (viewportManager.getWidth() - 112)) {
331-
// Free slot.
332-
} else if (touchXY.x < 112) {
333331
joystickClicked = true;
332+
} else if (touchXY.x < 112) {
333+
// Free slot.
334334
}
335335
}
336336
}

0 commit comments

Comments
 (0)