chore: avoid shadowing Window::show() (#5441)
This commit is contained in:
@@ -155,7 +155,7 @@ NumberKeyboard::NumberKeyboard() : Keyboard(KEYBOARD_HEIGHT)
|
|||||||
|
|
||||||
NumberKeyboard::~NumberKeyboard() { _instance = nullptr; }
|
NumberKeyboard::~NumberKeyboard() { _instance = nullptr; }
|
||||||
|
|
||||||
void NumberKeyboard::show(FormField* field)
|
void NumberKeyboard::open(FormField* field)
|
||||||
{
|
{
|
||||||
if (!_instance) _instance = new NumberKeyboard();
|
if (!_instance) _instance = new NumberKeyboard();
|
||||||
|
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ class NumberKeyboard : public Keyboard
|
|||||||
std::string getName() const override { return "NumberKeyboard"; }
|
std::string getName() const override { return "NumberKeyboard"; }
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static void show(FormField* field);
|
static void open(FormField* field);
|
||||||
|
|
||||||
void handleEvent(const char* btn);
|
void handleEvent(const char* btn);
|
||||||
|
|
||||||
|
|||||||
@@ -127,7 +127,7 @@ void TextKeyboard::onLongPressPGDN() { deleteChar(); }
|
|||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void TextKeyboard::show(FormField* field)
|
void TextKeyboard::open(FormField* field)
|
||||||
{
|
{
|
||||||
if (!_instance) _instance = new TextKeyboard();
|
if (!_instance) _instance = new TextKeyboard();
|
||||||
|
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ class TextKeyboard : public Keyboard
|
|||||||
std::string getName() const override { return "TextKeyboard"; }
|
std::string getName() const override { return "TextKeyboard"; }
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static void show(FormField* field);
|
static void open(FormField* field);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
#if defined(HARDWARE_KEYS)
|
#if defined(HARDWARE_KEYS)
|
||||||
|
|||||||
@@ -158,7 +158,7 @@ class NumberArea : public FormField
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void openKeyboard() { NumberKeyboard::show(this); }
|
void openKeyboard() { NumberKeyboard::open(this); }
|
||||||
void directEdit() { FormField::onClicked(); }
|
void directEdit() { FormField::onClicked(); }
|
||||||
|
|
||||||
void update()
|
void update()
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ class TextArea : public FormField
|
|||||||
}
|
}
|
||||||
|
|
||||||
void openKeyboard() {
|
void openKeyboard() {
|
||||||
TextKeyboard::show(this);
|
TextKeyboard::open(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
void setCancelHandler(std::function<void(void)> handler)
|
void setCancelHandler(std::function<void(void)> handler)
|
||||||
|
|||||||
Reference in New Issue
Block a user