Branch: refs/heads/1.34 Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Fri, 04 Jan 2019 11:54:35 UTC Commit: a3d723f0cfbe710d6138a483aab03c2f365b2f0f https://github.com/geany/geany/commit/a3d723f0cfbe710d6138a483aab03c2f365b2f...
Log Message: ----------- Fix modifier for creating rectangular selections on Windows
33dafac8f0713de79f04e2ebce2399fb914d6792 restored the pre-Scintilla 3.10 default on non-Windows, but also changed the Windows one. Fix this so the modifier keeps its historical value on Windows as well.
Modified Paths: -------------- src/editor.c
Modified: src/editor.c 11 lines changed, 9 insertions(+), 2 deletions(-) =================================================================== @@ -4905,6 +4905,7 @@ static gboolean register_named_icon(ScintillaObject *sci, guint id, const gchar static ScintillaObject *create_new_sci(GeanyEditor *editor) { ScintillaObject *sci; + int rectangular_selection_modifier;
sci = SCINTILLA(scintilla_new());
@@ -4936,8 +4937,14 @@ static ScintillaObject *create_new_sci(GeanyEditor *editor) /* necessary for column mode editing, implemented in Scintilla since 2.0 */ SSM(sci, SCI_SETADDITIONALSELECTIONTYPING, 1, 0);
- /* rectangular selection modifier for creating rectangular selections with the mouse */ - SSM(sci, SCI_SETRECTANGULARSELECTIONMODIFIER, SCMOD_CTRL, 0); + /* rectangular selection modifier for creating rectangular selections with the mouse. + * We use the historical Scintilla values by default. */ +#ifdef G_OS_WIN32 + rectangular_selection_modifier = SCMOD_ALT; +#else + rectangular_selection_modifier = SCMOD_CTRL; +#endif + SSM(sci, SCI_SETRECTANGULARSELECTIONMODIFIER, rectangular_selection_modifier, 0);
/* virtual space */ SSM(sci, SCI_SETVIRTUALSPACEOPTIONS, editor_prefs.show_virtual_space, 0);
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).