qi-hardware/gmenu2x
1
0
Fork 0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2024-12-26 19:06:48 +02:00
Code

InputDialog: do not return anything from drawVirtualKeyboard().

Browse Source 
The returned value (action) was ignored, so don't bother returning it.
This commit is contained in:
Maarten ter Huurne 2011-10-23 12:00:46 +02:00
parent fa5a9816db
commit 55cabcea49
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/inputdialog.cpp
View File

@ -135,7 +135,6 @@ bool InputDialog::exec() {
Uint32 caretTick = 0, curTick; Uint32 caretTick = 0, curTick;
bool caretOn = true; bool caretOn = true;
uint action;
close = false; close = false;
ok = true; ok = true;
while (!close) { while (!close) {
@ -168,7 +167,7 @@ bool InputDialog::exec() {
} }
if (ts.initialized()) ts.poll(); if (ts.initialized()) ts.poll();
action = drawVirtualKeyboard(); drawVirtualKeyboard();
gmenu2x->s->flip(); gmenu2x->s->flip();
switch (inputMgr.waitForPressedButton()) { switch (inputMgr.waitForPressedButton()) {
@ -244,9 +243,7 @@ void InputDialog::changeKeys() {
} }
} }
int InputDialog::drawVirtualKeyboard() { void InputDialog::drawVirtualKeyboard() {
int action = ID_NO_ACTION;
//keyboard border //keyboard border
gmenu2x->s->rectangle(kbRect, gmenu2x->skinConfColors[COLOR_SELECTION_BG]); gmenu2x->s->rectangle(kbRect, gmenu2x->skinConfColors[COLOR_SELECTION_BG]);
@ -323,11 +320,4 @@ int InputDialog::drawVirtualKeyboard() {
(int)(160 + kbLength * KEY_WIDTH / 4), (int)(160 + kbLength * KEY_WIDTH / 4),
KB_TOP + kb->size() * KEY_HEIGHT + KEY_HEIGHT / 2, KB_TOP + kb->size() * KEY_HEIGHT + KEY_HEIGHT / 2,
ASFont::HAlignCenter, ASFont::VAlignMiddle); ASFont::HAlignCenter, ASFont::VAlignMiddle);
//if ts released
if (ts.initialized() && ts.released() && ts.inRect(kbRect)) {
action = ID_ACTION_SELECT;
}
return action;
} }

2
src/inputdialog.h
View File

@ -70,7 +70,7 @@ private:
void confirm(); void confirm();
void changeKeys(); void changeKeys();
int drawVirtualKeyboard(); void drawVirtualKeyboard();
void setKeyboard(int); void setKeyboard(int);
public: public: