From 47585b882956646abbc04b503a888a78e075f323 Mon Sep 17 00:00:00 2001 From: kevinkoenig Date: Mon, 30 Aug 2021 04:35:55 -0400 Subject: [PATCH] fixed potential compilation issue --- .../libopenui/src/keyboard_base.cpp | 25 ----------------- .../thirdparty/libopenui/src/keyboard_base.h | 27 +++++++++++++++++-- 2 files changed, 25 insertions(+), 27 deletions(-) diff --git a/radio/src/thirdparty/libopenui/src/keyboard_base.cpp b/radio/src/thirdparty/libopenui/src/keyboard_base.cpp index e8444eda2..81efb7a2f 100644 --- a/radio/src/thirdparty/libopenui/src/keyboard_base.cpp +++ b/radio/src/thirdparty/libopenui/src/keyboard_base.cpp @@ -18,31 +18,6 @@ */ #include "keyboard_base.h" -void Keyboard::hide() -{ - if (activeKeyboard) { - activeKeyboard->clearField(); - activeKeyboard = nullptr; - } -} - -void Keyboard::clearField() -{ - detach(); - if (fields) { - fields->setHeight(oldHeight); - fields = nullptr; - } - if (fieldContainer) { - fieldContainer->setHeight(LCD_H - 0 - fieldContainer->top()); - fieldContainer = nullptr; - } - if (field) { - field->setEditMode(false); - field = nullptr; - } -} - coord_t calcScrollOffsetForField(FormField *newField, Window *topWindow) { // now we need to calculate the offset of the field in the fields scroll container diff --git a/radio/src/thirdparty/libopenui/src/keyboard_base.h b/radio/src/thirdparty/libopenui/src/keyboard_base.h index d55c55239..4f3cfcd78 100644 --- a/radio/src/thirdparty/libopenui/src/keyboard_base.h +++ b/radio/src/thirdparty/libopenui/src/keyboard_base.h @@ -29,7 +29,31 @@ class Keyboard: public FormWindow { } - static void hide(); + void clearField() + { + detach(); + if (fields) { + fields->setHeight(oldHeight); + fields = nullptr; + } + if (fieldContainer) { + fieldContainer->setHeight(LCD_H - 0 - fieldContainer->top()); + fieldContainer = nullptr; + } + if (field) { + field->setEditMode(false); + field = nullptr; + } + } + + static void hide() + { + if (activeKeyboard) { + activeKeyboard->clearField(); + activeKeyboard = nullptr; + } + } + protected: static Keyboard * activeKeyboard; @@ -39,7 +63,6 @@ class Keyboard: public FormWindow coord_t oldHeight = 0; void setField(FormField *newField); - void clearField(); Window *getFieldContainer(FormField * field); void attachKeyboard(); FormWindow *findFormWindow();