summaryrefslogtreecommitdiffstats
path: root/gui/objects.hpp
diff options
context:
space:
mode:
authorthat <github@that.at>2015-03-14 23:07:23 +0100
committerthat <github@that.at>2015-03-14 23:07:23 +0100
commite79878b7b661557ab73f076a55abcbc1bdbea1e0 (patch)
treebcd4bb2e0a1582a7c540baed8e14733568b28749 /gui/objects.hpp
parentgui: fix 1920x1200 keyboard "_", ":", "!" and "?" (diff)
downloadandroid_bootable_recovery-e79878b7b661557ab73f076a55abcbc1bdbea1e0.tar
android_bootable_recovery-e79878b7b661557ab73f076a55abcbc1bdbea1e0.tar.gz
android_bootable_recovery-e79878b7b661557ab73f076a55abcbc1bdbea1e0.tar.bz2
android_bootable_recovery-e79878b7b661557ab73f076a55abcbc1bdbea1e0.tar.lz
android_bootable_recovery-e79878b7b661557ab73f076a55abcbc1bdbea1e0.tar.xz
android_bootable_recovery-e79878b7b661557ab73f076a55abcbc1bdbea1e0.tar.zst
android_bootable_recovery-e79878b7b661557ab73f076a55abcbc1bdbea1e0.zip
Diffstat (limited to '')
-rw-r--r--gui/objects.hpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/gui/objects.hpp b/gui/objects.hpp
index b5675d9aa..6eeefc267 100644
--- a/gui/objects.hpp
+++ b/gui/objects.hpp
@@ -844,17 +844,14 @@ public:
virtual int SetRenderPos(int x, int y, int w = 0, int h = 0);
protected:
- virtual int GetSelection(int x, int y);
-
-protected:
- struct keyboard_key_class
+ struct Key
{
- unsigned char key;
+ unsigned char key; // ASCII code or one of the special KEYBOARD_* codes above
unsigned char longpresskey;
int end_x;
int layout;
};
- int ParseKey(const char* keyinfo, keyboard_key_class& key, int& Xindex, int keyWidth, bool longpress);
+ int ParseKey(const char* keyinfo, Key& key, int& Xindex, int keyWidth, bool longpress);
struct capslock_tracking_struct
{
int capslock;
@@ -862,8 +859,11 @@ protected:
int revert_layout;
};
+ // Find key at screen coordinates
+ Key* HitTestKey(int x, int y);
+
ImageResource* keyboardImg[MAX_KEYBOARD_LAYOUTS];
- struct keyboard_key_class keyboard_keys[MAX_KEYBOARD_LAYOUTS][MAX_KEYBOARD_ROWS][MAX_KEYBOARD_KEYS];
+ struct Key keyboard_keys[MAX_KEYBOARD_LAYOUTS][MAX_KEYBOARD_ROWS][MAX_KEYBOARD_KEYS];
struct capslock_tracking_struct caps_tracking[MAX_KEYBOARD_LAYOUTS];
bool mRendered;
std::string mVariable;