|
|
@ -290,10 +290,10 @@ void SoftwareKeyboard::ProcessTextCheck() { |
|
|
SubmitNormalOutputAndExit(SwkbdResult::Ok, current_text); |
|
|
SubmitNormalOutputAndExit(SwkbdResult::Ok, current_text); |
|
|
break; |
|
|
break; |
|
|
case SwkbdTextCheckResult::Failure: |
|
|
case SwkbdTextCheckResult::Failure: |
|
|
ShowTextCheckDialog(SwkbdTextCheckResult::Failure, text_check_message); |
|
|
|
|
|
|
|
|
ShowTextCheckDialog(SwkbdTextCheckResult::Failure, std::move(text_check_message)); |
|
|
break; |
|
|
break; |
|
|
case SwkbdTextCheckResult::Confirm: |
|
|
case SwkbdTextCheckResult::Confirm: |
|
|
ShowTextCheckDialog(SwkbdTextCheckResult::Confirm, text_check_message); |
|
|
|
|
|
|
|
|
ShowTextCheckDialog(SwkbdTextCheckResult::Confirm, std::move(text_check_message)); |
|
|
break; |
|
|
break; |
|
|
case SwkbdTextCheckResult::Silent: |
|
|
case SwkbdTextCheckResult::Silent: |
|
|
default: |
|
|
default: |
|
|
@ -487,7 +487,7 @@ void SoftwareKeyboard::InitializeFrontendKeyboard() { |
|
|
max_text_length <= 32 ? SwkbdTextDrawType::Line : SwkbdTextDrawType::Box; |
|
|
max_text_length <= 32 ? SwkbdTextDrawType::Line : SwkbdTextDrawType::Box; |
|
|
|
|
|
|
|
|
Core::Frontend::KeyboardInitializeParameters initialize_parameters{ |
|
|
Core::Frontend::KeyboardInitializeParameters initialize_parameters{ |
|
|
.ok_text{ok_text}, |
|
|
|
|
|
|
|
|
.ok_text{std::move(ok_text)}, |
|
|
.header_text{}, |
|
|
.header_text{}, |
|
|
.sub_text{}, |
|
|
.sub_text{}, |
|
|
.guide_text{}, |
|
|
.guide_text{}, |
|
|
@ -563,10 +563,10 @@ void SoftwareKeyboard::InitializeFrontendKeyboard() { |
|
|
: false; |
|
|
: false; |
|
|
|
|
|
|
|
|
Core::Frontend::KeyboardInitializeParameters initialize_parameters{ |
|
|
Core::Frontend::KeyboardInitializeParameters initialize_parameters{ |
|
|
.ok_text{ok_text}, |
|
|
|
|
|
.header_text{header_text}, |
|
|
|
|
|
.sub_text{sub_text}, |
|
|
|
|
|
.guide_text{guide_text}, |
|
|
|
|
|
|
|
|
.ok_text{std::move(ok_text)}, |
|
|
|
|
|
.header_text{std::move(header_text)}, |
|
|
|
|
|
.sub_text{std::move(sub_text)}, |
|
|
|
|
|
.guide_text{std::move(guide_text)}, |
|
|
.initial_text{initial_text}, |
|
|
.initial_text{initial_text}, |
|
|
.max_text_length{max_text_length}, |
|
|
.max_text_length{max_text_length}, |
|
|
.min_text_length{min_text_length}, |
|
|
.min_text_length{min_text_length}, |
|
|
@ -595,7 +595,7 @@ void SoftwareKeyboard::ShowNormalKeyboard() { |
|
|
|
|
|
|
|
|
void SoftwareKeyboard::ShowTextCheckDialog(SwkbdTextCheckResult text_check_result, |
|
|
void SoftwareKeyboard::ShowTextCheckDialog(SwkbdTextCheckResult text_check_result, |
|
|
std::u16string text_check_message) { |
|
|
std::u16string text_check_message) { |
|
|
frontend.ShowTextCheckDialog(text_check_result, text_check_message); |
|
|
|
|
|
|
|
|
frontend.ShowTextCheckDialog(text_check_result, std::move(text_check_message)); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
void SoftwareKeyboard::ShowInlineKeyboard() { |
|
|
void SoftwareKeyboard::ShowInlineKeyboard() { |
|
|
|