Skip to content

Commit b01a6a0

Browse files
committed
Make Make use same Tab (Bullet, Indent) keys
1 parent 0434ec0 commit b01a6a0

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

source/editbox.pas

+11-2
Original file line numberDiff line numberDiff line change
@@ -4274,11 +4274,18 @@ procedure TEditBoxForm.KMemo1KeyDown(Sender: TObject; var Key: Word; Shift: TShi
42744274
VK_2 : AlterFont(ChangeSize, Sett.FontNormal);
42754275
VK_3 : AlterFont(ChangeSize, Sett.FontLarge);
42764276
VK_4 : AlterFont(ChangeSize, Sett.FontHuge);
4277+
VK_TAB : begin if not CaretInTitle() then IndentControl(True); Key := 0; end; // Mac ???
42774278
end;
42784279
Key := 0;
42794280
exit;
42804281
end;
42814282
if ([ssAlt, ssShift] = Shift) and ((Key = VK_RIGHT) or (Key = VK_LEFT)) then exit; // KMemo - extend selection one word left or right
4283+
if ([ssShift] = shift) and (Key = VK_TAB) then begin
4284+
if not CaretInTitle() then
4285+
IndentControl(False);
4286+
Key := 0;
4287+
exit();
4288+
end;
42824289
{$endif DARWIN}
42834290

42844291
if (Key = VK_ESCAPE) and Sett.CheckEscClosesNote.Checked then close; // Will do normal save stuff first.
@@ -4296,6 +4303,8 @@ procedure TEditBoxForm.KMemo1KeyDown(Sender: TObject; var Key: Word; Shift: TShi
42964303
Undoer.RecordInitial(Key); // used, onKeyPress must follow and it gets only text type keys.
42974304

42984305

4306+
4307+
42994308
{$ifndef DARWIN}
43004309
// -------------- Shift -------------------
43014310
if [ssShift] = shift then begin
@@ -4318,7 +4327,7 @@ procedure TEditBoxForm.KMemo1KeyDown(Sender: TObject; var Key: Word; Shift: TShi
43184327
end;
43194328
{$endif}
43204329

4321-
// -------------- Control ------------------
4330+
// -------------- Control (Command on Mac) ------------------
43224331
if {$ifdef Darwin}[ssMeta] = Shift {$else}[ssCtrl] = Shift{$endif} then begin
43234332
case key of
43244333
VK_Return, VK_G : begin
@@ -4346,7 +4355,7 @@ procedure TEditBoxForm.KMemo1KeyDown(Sender: TObject; var Key: Word; Shift: TShi
43464355
VK_M : begin Key := 0; DoRightClickMenu; end;
43474356
VK_N : SearchForm.OpenNote('');
43484357
VK_E : InitiateCalc();
4349-
VK_TAB : begin if not CaretInTitle() then IndentControl(True); Key := 0; end;
4358+
VK_TAB : begin if not CaretInTitle() then IndentControl(True); Key := 0; end; // On Mac, OS hijacks sequence for its own use.
43504359
VK_F4 : close; // close just this note, normal saving will take place
43514360
VK_C, VK_A, VK_HOME, VK_END, VK_UP, VK_DOWN, VK_LEFT, VK_RIGHT, VK_PRIOR, VK_NEXT, VK_INSERT : exit;
43524361
end;

0 commit comments

Comments
 (0)