!23 refactor surface/display/resource/wnd

* fix typo
* refactor display/surface
* Merge branch 'master' into dev
* add boundary check for fill_rect
* Merge branch 'master' into dev
* Merge branch 'master' into dev
* refactor wnd.cpp
* rename some variables
This commit is contained in:
idea4good
2019-10-02 10:49:41 +08:00
parent 6812cdcf6d
commit afd7a1c6f3
14 changed files with 51 additions and 100 deletions

View File

@@ -184,13 +184,13 @@ void c_keyboard::on_caps_clicked(unsigned int ctrl_id)
void c_keyboard::on_enter_clicked(unsigned int ctrl_id)
{
memset(m_str, 0, sizeof(m_str));
notify_parent(KEYBORAD_CLICK, get_id(), CLICK_ENTER);
notify_parent(KEYBORAD_CLICK, CLICK_ENTER);
}
void c_keyboard::on_esc_clicked(unsigned int ctrl_id)
{
memset(m_str, 0, sizeof(m_str));
notify_parent(KEYBORAD_CLICK, get_id(), CLICK_ESC);
notify_parent(KEYBORAD_CLICK, CLICK_ESC);
}
void c_keyboard::on_del_clicked(unsigned int ctrl_id)
@@ -200,7 +200,7 @@ void c_keyboard::on_del_clicked(unsigned int ctrl_id)
return;
}
m_str[--m_str_len] = 0;
notify_parent(KEYBORAD_CLICK, get_id(), CLICK_CHAR);
notify_parent(KEYBORAD_CLICK, CLICK_CHAR);
}
void c_keyboard::on_char_clicked(unsigned int ctrl_id)
@@ -225,7 +225,7 @@ void c_keyboard::on_char_clicked(unsigned int ctrl_id)
ASSERT(false);
InputChar:
m_str[m_str_len++] = ctrl_id;
notify_parent(KEYBORAD_CLICK, get_id(), CLICK_CHAR);
notify_parent(KEYBORAD_CLICK, CLICK_CHAR);
}
void c_keyboard::on_paint()