From 5c805e494425a88da1813902b1ad8a1ab351e30d Mon Sep 17 00:00:00 2001 From: crupest Date: Sun, 5 Jul 2020 23:06:02 +0800 Subject: ... --- demos/input_method/main.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'demos/input_method/main.cpp') diff --git a/demos/input_method/main.cpp b/demos/input_method/main.cpp index b109f5e7..215eba16 100644 --- a/demos/input_method/main.cpp +++ b/demos/input_method/main.cpp @@ -31,19 +31,19 @@ int main() { auto target_clause_brush = graph_factory->CreateSolidColorBrush(); target_clause_brush->SetColor(colors::blue); - std::shared_ptr font = graph_factory->CreateFont("等线", 30); + std::shared_ptr font = graph_factory->CreateFont(u"等线", 30); float window_width = 10000; auto prompt_text_layout = graph_factory->CreateTextLayout(font, - "Alt+F1: Enable IME\n" - "Alt+F2: Disable IME\n" - "Alt+F3: Complete composition.\n" - "Alt+F4: Cancel composition."); + u"Alt+F1: Enable IME\n" + u"Alt+F2: Disable IME\n" + u"Alt+F3: Complete composition.\n" + u"Alt+F4: Cancel composition."); std::optional optional_composition_text; - std::string committed_text; + std::u16string committed_text; window->ResizeEvent()->AddHandler( [&prompt_text_layout, &window_width](const Size& size) { @@ -60,9 +60,9 @@ int main() { const auto anchor_y = prompt_text_layout->GetTextBounds().height; auto text_layout = graph_factory->CreateTextLayout( - font, - committed_text + - (optional_composition_text ? optional_composition_text->text : "")); + font, committed_text + (optional_composition_text + ? optional_composition_text->text + : u"")); text_layout->SetMaxWidth(window_width); if (optional_composition_text) { @@ -123,7 +123,7 @@ int main() { }); input_method_context->TextEvent()->AddHandler( - [window, &committed_text](const std::string_view& c) { + [window, &committed_text](const std::u16string_view& c) { committed_text += c; window->RequestRepaint(); }); -- cgit v1.2.3