mirror of
https://github.com/whoahq/whoa.git
synced 2026-02-02 08:42:45 +03:00
Merge branch 'master' into feat-CSimpleEditBox-OnEscapePressed-branch
This commit is contained in:
commit
cb4b06f62a
@ -769,6 +769,11 @@ void CSimpleEditBox::OnEscapePressed() {
|
||||
// TODO this->DispatchAction(EVENT_ESCAPE);
|
||||
}
|
||||
|
||||
void CSimpleEditBox::OnTabPressed() {
|
||||
this->RunOnTabPressedScript();
|
||||
// TODO this->DispatchAction(EVENT_TAB);
|
||||
}
|
||||
|
||||
void CSimpleEditBox::OnFrameSizeChanged(float width, float height) {
|
||||
CSimpleFrame::OnFrameSizeChanged(width, height);
|
||||
this->UpdateSizes();
|
||||
@ -880,6 +885,10 @@ int32_t CSimpleEditBox::OnLayerKeyDown(const CKeyEvent& evt) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
case KEY_TAB: {
|
||||
this->OnTabPressed();
|
||||
}
|
||||
// TODO
|
||||
// - remaining keys
|
||||
|
||||
@ -1026,6 +1035,12 @@ void CSimpleEditBox::RunOnEscapePressedScript() {
|
||||
}
|
||||
}
|
||||
|
||||
void CSimpleEditBox::RunOnTabPressedScript() {
|
||||
if (this->m_onTabPressed.luaRef) {
|
||||
this->RunScript(this->m_onTabPressed, 0, nullptr);
|
||||
}
|
||||
}
|
||||
|
||||
void CSimpleEditBox::RunOnTextChangedScript(int32_t changed) {
|
||||
if (this->m_onTextChanged.luaRef) {
|
||||
auto L = FrameScript_GetContext();
|
||||
|
||||
@ -93,6 +93,7 @@ class CSimpleEditBox : public CSimpleFrame, CSimpleFontedFrame {
|
||||
void MoveForward(int32_t highlight);
|
||||
void OnEnterPressed();
|
||||
void OnEscapePressed();
|
||||
void OnTabPressed();
|
||||
void OnTextChanged();
|
||||
int32_t PrevCharOffset(int32_t offset);
|
||||
void RunOnCursorChangedScript(float x, float y, float w, float h);
|
||||
@ -100,6 +101,7 @@ class CSimpleEditBox : public CSimpleFrame, CSimpleFontedFrame {
|
||||
void RunOnEditFocusLostScript();
|
||||
void RunOnEnterPressedScript();
|
||||
void RunOnEscapePressedScript();
|
||||
void RunOnTabPressedScript();
|
||||
void RunOnTextChangedScript(int32_t changed);
|
||||
void SetCursorPosition(int32_t position);
|
||||
void SetHistoryLines(int32_t a2);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user