dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r25684) -Change: [Win32] Draw the composition string ourselves if possible.

Browse Source
This commit is contained in:
michi_cc
2013-08-05 20:37:25 +00:00
parent 931bbd7191
commit d442d97cf1
7 changed files with 101 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/window.cpp
View File

@@ -2551,12 +2551,12 @@ void HandleCtrlChanged()
* @param wid Edit box widget.
* @param str Text string to insert.
*/
/* virtual */ void Window::InsertTextString(int wid, const char *str)
/* virtual */ void Window::InsertTextString(int wid, const char *str, bool marked, const char *caret)
{
QueryString *query = this->GetQueryString(wid);
if (query == NULL) return;
if (query->text.InsertString(str)) {
if (query->text.InsertString(str, marked, caret) || marked) {
this->SetWidgetDirty(wid);
this->OnEditboxChanged(wid);
}
@@ -2565,12 +2565,14 @@ void HandleCtrlChanged()
/**
* Handle text input.
* @param str Text string to input.
* @param marked Is the input a marked composition string from an IME?
* @param caret Move the caret to this point in the insertion string.
*/
void HandleTextInput(const char *str)
void HandleTextInput(const char *str, bool marked, const char *caret)
{
if (!EditBoxInGlobalFocus()) return;
_focused_window->InsertTextString(_focused_window->window_class == WC_CONSOLE ? 0 : _focused_window->nested_focus->index, str);
_focused_window->InsertTextString(_focused_window->window_class == WC_CONSOLE ? 0 : _focused_window->nested_focus->index, str, marked, caret);
}
/**