|
15 | 15 | #include "keypad.h" |
16 | 16 |
|
17 | 17 | // the size at which the tablet layout is selected |
18 | | -constexpr int WIDE_LAYOUT = 600; |
| 18 | +constexpr int WIDE_LAYOUT = 1100; |
19 | 19 |
|
20 | 20 | // the size of PNGs as defined in keypad/build.sh |
21 | 21 | constexpr int IMAGE_SIZE = 30; |
@@ -222,10 +222,10 @@ namespace TabletKeypadLayout { |
222 | 222 | { |
223 | 223 | {K_LINE_UP, K_PAGE_UP, K_LINE_UP, K_PAGE_UP}, |
224 | 224 | {K_LINE_DOWN, K_PAGE_DOWN, K_LINE_DOWN, K_PAGE_DOWN}, |
| 225 | + {K_LEFT, K_LEFT, K_LEFT, K_LEFT}, |
225 | 226 | {K_LPAREN, K_SLASH, K_COMMA, K_LBRACKET}, |
226 | 227 | {K_SPACE, K_SPACE, K_SPACE, K_SPACE}, |
227 | 228 | {K_RPAREN, K_HASH, K_EQUALS, K_RBRACKET}, |
228 | | - {K_LEFT, K_LEFT, K_LEFT, K_LEFT}, |
229 | 229 | {K_RIGHT, K_RIGHT, K_RIGHT, K_RIGHT}, |
230 | 230 | {K_ENTER, K_ENTER, K_ENTER, K_ENTER}, |
231 | 231 | {K_NULL}, |
@@ -602,7 +602,7 @@ void Key::onClick(KeypadDrawContext *context) const { |
602 | 602 | event->key = SB_KEY_RIGHT; |
603 | 603 | break; |
604 | 604 | default: |
605 | | - event->key = (unsigned char)context->getKey(_key); |
| 605 | + event->key = static_cast<unsigned char>(context->getKey(_key)); |
606 | 606 | context->onClick(_key); |
607 | 607 | break; |
608 | 608 | } |
@@ -692,7 +692,7 @@ void Keypad::layout(int x, int y, int w, int h) { |
692 | 692 | } else if (isArrow(key->_key._lower)) { |
693 | 693 | keyWidth = static_cast<int>(keyWidth * 1.2); |
694 | 694 | } else if (!key->_printable && key->_key._lower != K_TAG) { |
695 | | - const int numKeys = 2; |
| 695 | + constexpr int numKeys = 2; |
696 | 696 | keyWidth = (_width - ((cols - numKeys) * keyW)) / numKeys; |
697 | 697 | } else if (key->_key._lower == K_SPACE) { |
698 | 698 | keyWidth = (_layout->getSpaceCols() * keyW); |
@@ -726,7 +726,7 @@ int Keypad::layoutHeight(int screenHeight) { |
726 | 726 | } |
727 | 727 |
|
728 | 728 | void Keypad::clicked(int x, int y, bool pressed) { |
729 | | - Key *down = _pressed; |
| 729 | + const Key *down = _pressed; |
730 | 730 | _pressed = nullptr; |
731 | 731 | for (const auto key : _keys) { |
732 | 732 | if (key->inside(x, y)) { |
|
0 commit comments