summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Soffke <christian.soffke@gmail.com>2021-12-10 18:01:38 +0100
committerChristian Soffke <christian.soffke@gmail.com>2021-12-10 18:01:38 +0100
commitf1eb0483d6cafd19ac7e813ccf3b7fa33405502e (patch)
treefbea83054f374e3cf718c9e493570eb7df1f80a4
parentf78a0e52306951f8e4031bf6db9fbfba83982fcf (diff)
downloadrockbox-f1eb0483d6cafd19ac7e813ccf3b7fa33405502e.tar.gz
rockbox-f1eb0483d6cafd19ac7e813ccf3b7fa33405502e.zip
m3k simulator: add screen bezel
Change-Id: I4a34e5be7a459f909b81266b70c30f2968068696
-rw-r--r--firmware/target/hosted/sdl/sim-ui-defines.h8
-rw-r--r--uisimulator/bitmaps/UI-fiiom3k.bmpbin676310 -> 919294 bytes
-rw-r--r--uisimulator/buttonmap/fiio-m3k.c22
3 files changed, 15 insertions, 15 deletions
diff --git a/firmware/target/hosted/sdl/sim-ui-defines.h b/firmware/target/hosted/sdl/sim-ui-defines.h
index baba357ccc..6235f106d4 100644
--- a/firmware/target/hosted/sdl/sim-ui-defines.h
+++ b/firmware/target/hosted/sdl/sim-ui-defines.h
@@ -523,10 +523,10 @@
#elif defined(FIIO_M3K) || defined(FIIO_M3K_LINUX)
#define UI_TITLE "FiiO M3K"
-#define UI_WIDTH 287 /* width of GUI window */
-#define UI_HEIGHT 589 /* height of GUI window */
-#define UI_LCD_POSX 25
-#define UI_LCD_POSY 15
+#define UI_WIDTH 335 /* width of GUI window */
+#define UI_HEIGHT 686 /* height of GUI window */
+#define UI_LCD_POSX 49
+#define UI_LCD_POSY 38
#elif defined(SHANLING_Q1)
diff --git a/uisimulator/bitmaps/UI-fiiom3k.bmp b/uisimulator/bitmaps/UI-fiiom3k.bmp
index 118424ef5f..bb168000f2 100644
--- a/uisimulator/bitmaps/UI-fiiom3k.bmp
+++ b/uisimulator/bitmaps/UI-fiiom3k.bmp
Binary files differ
diff --git a/uisimulator/buttonmap/fiio-m3k.c b/uisimulator/buttonmap/fiio-m3k.c
index 82a2ab0bb5..45d0ab6ae6 100644
--- a/uisimulator/buttonmap/fiio-m3k.c
+++ b/uisimulator/buttonmap/fiio-m3k.c
@@ -84,16 +84,16 @@ int key_to_button(int keyboard_button)
}
struct button_map bm[] = {
- { SDLK_ESCAPE, 12, 55, 15, "Power" },
- { SDLK_KP_MINUS, 12, 188, 15, "Volume -" },
- { SDLK_KP_PLUS, 12, 125, 15, "Volume +" },
- { SDLK_SPACE, 12, 255, 15, "Play" },
- { SDLK_UP, 146, 394, 20, "Up" },
- { SDLK_RETURN, 146, 438, 20, "Select" },
- { SDLK_DOWN, 146, 510, 20, "Down" },
- { SDLK_INSERT, 68, 368, 20, "Menu" },
- { SDLK_LEFT, 68, 532, 20, "Left" },
- { SDLK_RIGHT, 224, 532, 20, "Right" },
- { SDLK_BACKSPACE, 224, 368, 20, "Back" },
+ { SDLK_ESCAPE, 14, 64, 15, "Power" },
+ { SDLK_KP_MINUS, 14, 220, 15, "Volume -" },
+ { SDLK_KP_PLUS, 14, 140, 15, "Volume +" },
+ { SDLK_SPACE, 14, 300, 15, "Play" },
+ { SDLK_UP, 170, 445, 25, "Up" },
+ { SDLK_RETURN, 170, 520, 25, "Select" },
+ { SDLK_DOWN, 170, 600, 25, "Down" },
+ { SDLK_INSERT, 79, 428, 25, "Menu" },
+ { SDLK_LEFT, 79, 621, 25, "Left" },
+ { SDLK_RIGHT, 260, 621, 25, "Right" },
+ { SDLK_BACKSPACE, 260, 428, 25, "Back" },
{ 0, 0, 0, 0, "None" }
};