[geany/geany] 83d36f: Merge pull request #2032 from b4n/scintilla-rectangular-modifier-windows

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Fri, 04 Jan 2019 11:53:26 UTC
Commit:      83d36f00ba9ff22a0bd0503dd847b395bc7b154c
             https://github.com/geany/geany/commit/83d36f00ba9ff22a0bd0503dd847b395bc7b154c

Log Message:
-----------
Merge pull request #2032 from b4n/scintilla-rectangular-modifier-windows

Fix modifier for creating rectangular selections on Windows


Modified Paths:
--------------
    src/editor.c

Modified: src/editor.c
11 lines changed, 9 insertions(+), 2 deletions(-)
===================================================================
@@ -4900,6 +4900,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());
 
@@ -4931,8 +4932,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).