tsndr/M5PaperOS
1
0
Fork 0
Code Issues Pull Requests Activity

Refactored

Browse Source
This commit is contained in:
Toby
2021-03-20 16:07:46 +01:00
parent e451875d36
commit b53332acdd
47 changed files with 746 additions and 1604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/frame/frame_keyboard.cpp
View File

@@ -2,16 +2,13 @@
uint16_t textsize = 26;
void key_textclear_cb(epdgui_args_vector_t &args)
{
void key_textclear_cb(epdgui_args_vector_t &args) {
((EPDGUI_Textbox*)(args[0]))->SetText("");
}
void key_textsize_plus_cb(epdgui_args_vector_t &args)
{
void key_textsize_plus_cb(epdgui_args_vector_t &args) {
textsize += 4;
if(textsize > 96)
{
if(textsize > 96) {
textsize = 96;
}
char buf[10];
@@ -21,11 +18,9 @@ void key_textsize_plus_cb(epdgui_args_vector_t &args)
((EPDGUI_Textbox*)(args[0]))->SetTextSize(textsize);
}
void key_textsize_minus_cb(epdgui_args_vector_t &args)
{
void key_textsize_minus_cb(epdgui_args_vector_t &args) {
textsize -= 4;
if(textsize < 12)
{
if(textsize < 12) {
textsize = 12;
}
char buf[10];
@@ -35,8 +30,7 @@ void key_textsize_minus_cb(epdgui_args_vector_t &args)
((EPDGUI_Textbox*)(args[0]))->SetTextSize(textsize);
}
void key_textsize_reset_cb(epdgui_args_vector_t &args)
{
void key_textsize_reset_cb(epdgui_args_vector_t &args) {
textsize = 26;
char buf[10];
sprintf(buf, "%d", textsize);
@@ -45,12 +39,10 @@ void key_textsize_reset_cb(epdgui_args_vector_t &args)
((EPDGUI_Textbox*)(args[0]))->SetTextSize(textsize);
}
Frame_Keyboard::Frame_Keyboard(bool isHorizontal) : Frame_Base()
{
Frame_Keyboard::Frame_Keyboard(bool isHorizontal) : Frame_Base() {
_frame_name = "Frame_Keyboard";
uint8_t language = GetLanguage();
if(isHorizontal)
{
if(isHorizontal) {
inputbox = new EPDGUI_Textbox(84, 25, 712, 250);
if(language == LANGUAGE_JA)
key_textclear = new EPDGUI_Button("削除", 804, 25, 72, 120);
@@ -62,9 +54,7 @@ Frame_Keyboard::Frame_Keyboard(bool isHorizontal) : Frame_Base()
key_textsize_plus = new EPDGUI_Button("+", 804, 157, 72, 40);
key_textsize_reset = new EPDGUI_Button("26", 804, 196, 72, 40);
key_textsize_minus = new EPDGUI_Button("-", 804, 235, 72, 40);
}
else
{
} else {
const uint16_t kKeyBaseY = 628;
inputbox = new EPDGUI_Textbox(4, 100, 532, 512);
if(language == LANGUAGE_JA)
@@ -95,18 +85,13 @@ Frame_Keyboard::Frame_Keyboard(bool isHorizontal) : Frame_Base()
key_textsize_minus->AddArgs(EPDGUI_Button::EVENT_RELEASED, 1, (void*)key_textsize_reset);
key_textsize_minus->Bind(EPDGUI_Button::EVENT_RELEASED, key_textsize_minus_cb);
if(language == LANGUAGE_JA)
{
if(language == LANGUAGE_JA) {
exitbtn("ホーム");
_canvas_title->drawString("鍵盤", 270, 34);
}
else if(language == LANGUAGE_ZH)
{
} else if(language == LANGUAGE_ZH) {
exitbtn("主页");
_canvas_title->drawString("键盘", 270, 34);
}
else
{
} else {
exitbtn("Home");
_canvas_title->drawString("Keyboard", 270, 34);
}
@@ -115,8 +100,7 @@ Frame_Keyboard::Frame_Keyboard(bool isHorizontal) : Frame_Base()
_key_exit->Bind(EPDGUI_Button::EVENT_RELEASED, &Frame_Base::exit_cb);
}
Frame_Keyboard::~Frame_Keyboard()
{
Frame_Keyboard::~Frame_Keyboard() {
delete inputbox;
delete keyboard;
delete key_textclear;
@@ -125,8 +109,7 @@ Frame_Keyboard::~Frame_Keyboard()
delete key_textsize_minus;
}
int Frame_Keyboard::init(epdgui_args_vector_t &args)
{
int Frame_Keyboard::init(epdgui_args_vector_t &args) {
_is_run = 1;
M5.EPD.Clear();
_canvas_title->pushCanvas(0, 8, UPDATE_MODE_NONE);
@@ -140,8 +123,7 @@ int Frame_Keyboard::init(epdgui_args_vector_t &args)
return 6;
}
int Frame_Keyboard::run(void)
{
int Frame_Keyboard::run(void) {
inputbox->AddText(keyboard->getData());
return 1;
}