Branch: refs/heads/master Author: sinpowei sinpowei@gmail.com Committer: Matthew Brush mbrush@codebrainz.ca Date: Fri, 04 Aug 2017 06:23:42 UTC Commit: 08e2714c1cf6e341da9a9c253ab938ae5bea12c5 https://github.com/geany/geany/commit/08e2714c1cf6e341da9a9c253ab938ae5bea12...

Log Message: ----------- Add an editor option to enable IME's candidate window display inline, fix the issue that candidate window can't follow cursor.

Closes #1514

Modified Paths: -------------- doc/geany.txt src/editor.c src/editor.h src/keyfile.c

Modified: doc/geany.txt 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -2527,6 +2527,9 @@ show_editor_scrollbars Whether to display scrollbars. If set to t indent_hard_tab_width The size of a tab character. Don't change 8 immediately it unless you really need to; use the indentation settings instead. +editor_ime_interaction Input method editor (IME)'s candidate 0 to new + window behaviour. May be 0 (windowed) or documents + 1 (inline) **Interface related** show_symbol_list_expanders Whether to show or hide the small true to new expander icons on the symbol list documents

Modified: src/editor.c 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -4940,7 +4940,10 @@ static ScintillaObject *create_new_sci(GeanyEditor *editor)

/* virtual space */ SSM(sci, SCI_SETVIRTUALSPACEOPTIONS, editor_prefs.show_virtual_space, 0); - + + /* input method editor's candidate window behaviour */ + SSM(sci, SCI_SETIMEINTERACTION, editor_prefs.ime_interaction, 0); + #ifdef GDK_WINDOWING_QUARTZ # if ! GTK_CHECK_VERSION(3,16,0) /* "retina" (HiDPI) display support on OS X - requires disabling buffered draw

Modified: src/editor.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -138,6 +138,7 @@ typedef struct GeanyEditorPrefs gboolean long_line_enabled; gint autocompletion_update_freq; gint scroll_lines_around_cursor; + gint ime_interaction; /* input method editor's candidate window behaviour */ } GeanyEditorPrefs;

Modified: src/keyfile.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -257,6 +257,8 @@ static void init_pref_groups(void) "extract_filetype_regex", GEANY_DEFAULT_FILETYPE_REGEX); stash_group_add_boolean(group, &search_prefs.replace_and_find_by_default, "replace_and_find_by_default", TRUE); + stash_group_add_integer(group, &editor_prefs.ime_interaction, + "editor_ime_interaction", SC_IME_WINDOWED);

/* Note: Interface-related various prefs are in ui_init_prefs() */

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).