mirror of
git://projects.qi-hardware.com/gmenu2x.git
synced 2024-12-25 19:28:58 +02:00
InputDialog: do not return anything from drawVirtualKeyboard().
The returned value (action) was ignored, so don't bother returning it.
This commit is contained in:
parent
fa5a9816db
commit
55cabcea49
@ -135,7 +135,6 @@ bool InputDialog::exec() {
|
||||
Uint32 caretTick = 0, curTick;
|
||||
bool caretOn = true;
|
||||
|
||||
uint action;
|
||||
close = false;
|
||||
ok = true;
|
||||
while (!close) {
|
||||
@ -168,7 +167,7 @@ bool InputDialog::exec() {
|
||||
}
|
||||
|
||||
if (ts.initialized()) ts.poll();
|
||||
action = drawVirtualKeyboard();
|
||||
drawVirtualKeyboard();
|
||||
gmenu2x->s->flip();
|
||||
|
||||
switch (inputMgr.waitForPressedButton()) {
|
||||
@ -244,9 +243,7 @@ void InputDialog::changeKeys() {
|
||||
}
|
||||
}
|
||||
|
||||
int InputDialog::drawVirtualKeyboard() {
|
||||
int action = ID_NO_ACTION;
|
||||
|
||||
void InputDialog::drawVirtualKeyboard() {
|
||||
//keyboard border
|
||||
gmenu2x->s->rectangle(kbRect, gmenu2x->skinConfColors[COLOR_SELECTION_BG]);
|
||||
|
||||
@ -323,11 +320,4 @@ int InputDialog::drawVirtualKeyboard() {
|
||||
(int)(160 + kbLength * KEY_WIDTH / 4),
|
||||
KB_TOP + kb->size() * KEY_HEIGHT + KEY_HEIGHT / 2,
|
||||
ASFont::HAlignCenter, ASFont::VAlignMiddle);
|
||||
|
||||
//if ts released
|
||||
if (ts.initialized() && ts.released() && ts.inRect(kbRect)) {
|
||||
action = ID_ACTION_SELECT;
|
||||
}
|
||||
|
||||
return action;
|
||||
}
|
||||
|
@ -70,7 +70,7 @@ private:
|
||||
void confirm();
|
||||
void changeKeys();
|
||||
|
||||
int drawVirtualKeyboard();
|
||||
void drawVirtualKeyboard();
|
||||
void setKeyboard(int);
|
||||
|
||||
public:
|
||||
|
Loading…
Reference in New Issue
Block a user