From 315ab3ee0134a0e735800718f3b3ca6d6bd72fb7 Mon Sep 17 00:00:00 2001
From: Martijn Laan <1092369+martijnlaan@users.noreply.github.com>
Date: Sun, 23 Jun 2024 06:29:04 +0200
Subject: [PATCH] Tweaks.

---
 ISHelp/isetup.xml              | 10 ++++++++--
 Projects/Src/CompScintEdit.pas | 11 +++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/ISHelp/isetup.xml b/ISHelp/isetup.xml
index 5b897abed..132bf0b80 100644
--- a/ISHelp/isetup.xml
+++ b/ISHelp/isetup.xml
@@ -3228,7 +3228,10 @@ Filename: "{win}\MYPROG.INI"; Section: "InstallSettings"; Key: "InstallPath"; St
   <td>Move selected lines down.</td><td>Alt+Down</td>
 </tr>
 <tr>
-  <td>Duplicate selection or copy lines down.</td><td>Ctrl+D</td><td>Shift+Alt+Down</td>
+  <td>Duplicate selection or copy lines down.</td><td>Ctrl+D</td><td>-</td>
+</tr>
+<tr>
+  <td>Copy line down.</td><td>-</td><td>Shift+Alt+Down</td>
 </tr>
 <tr>
   <td>Lowercase lines.</td><td>Ctrl+U</td>
@@ -3282,7 +3285,7 @@ Filename: "{win}\MYPROG.INI"; Section: "InstallSettings"; Key: "InstallPath"; St
   <td>&nbsp;</td>
 </tr>
 <tr>
-  <td>Perform rectangular block selection (mouse).</td><td>Alt+Drag</td>
+  <td>Perform rectangular block selection (mouse). Shift extends selection.</td><td>Alt+Drag</td>
 </tr>
 <tr>
   <td>Perform rectangular block selection (keyboard).</td><td>Shift+Alt+Arrow</td><td>Ctrl+Shift+Alt+Arrow</td>
@@ -3305,6 +3308,9 @@ Filename: "{win}\MYPROG.INI"; Section: "InstallSettings"; Key: "InstallPath"; St
 <tr>
   <td>Unfold line.</td><td>Ctrl+Shift+]</td>
 </tr>
+<tr>
+  <td>Fold or unfold all.</td><td>Ctrl+Shift+Click in folding margin</td>
+</tr>
 <tr>
   <td>&nbsp;</td>
 </tr>
diff --git a/Projects/Src/CompScintEdit.pas b/Projects/Src/CompScintEdit.pas
index b3a36ba22..8d66042af 100644
--- a/Projects/Src/CompScintEdit.pas
+++ b/Projects/Src/CompScintEdit.pas
@@ -370,9 +370,16 @@ procedure TCompScintEdit.SetKeyMappingType(
       end;
       { Now that Shift+Alt+Down has been freed we can use it for line duplication
         which frees Ctrl+D . There's no clear for this one in the else
-        because it's a member of RectExtendKeyCodeCommands already. }
-      AssignCmdKey(SCK_DOWN, [ssShift, ssAlt], SCI_SELECTIONDUPLICATE);
+        because there it's a member of RectExtendKeyCodeCommands already. }
+      AssignCmdKey(SCK_DOWN, [ssShift, ssAlt], SCI_LINEDUPLICATE);
       ClearCmdKey('D', [ssCtrl]);
+      { Shift+Alt+Up should copy line up but there's no SCI command for that
+        atm. Shift+Alt+Left/Right should shrink/expand selecting for which
+        there's also no SCI command atm but CHARLEFT/RIGHTEXTEND is close enough
+        so assign those. There's no clear for these in the else because there
+        they're a member of RectExtendKeyCodeCommands already. }
+      AssignCmdKey(SCK_LEFT, [ssShift, ssAlt], SCI_CHARLEFTEXTEND);
+      AssignCmdKey(SCK_RIGHT, [ssShift, ssAlt], SCI_CHARRIGHTEXTEND);
       { Use Ctrl+Shift+K for line deletion which frees Ctrl+Shift+L }
       AssignCmdKey('K', [ssShift, ssCtrl], SCI_LINEDELETE);
       ClearCmdKey('L', [ssShift, ssCtrl]);