|
@@ -2369,8 +2369,6 @@ public class TextView : View
|
|
|
);
|
|
|
AddCommand (Command.Tab, () => ProcessTab ());
|
|
|
AddCommand (Command.BackTab, () => ProcessBackTab ());
|
|
|
- //AddCommand (Command.NextView, () => ProcessMoveNextView ());
|
|
|
- //AddCommand (Command.PreviousView, () => ProcessMovePreviousView ());
|
|
|
|
|
|
AddCommand (
|
|
|
Command.Undo,
|
|
@@ -2503,12 +2501,6 @@ public class TextView : View
|
|
|
KeyBindings.Add (Key.Tab, Command.Tab);
|
|
|
KeyBindings.Add (Key.Tab.WithShift, Command.BackTab);
|
|
|
|
|
|
- //KeyBindings.Add (Key.Tab.WithCtrl, Command.NextView);
|
|
|
- //KeyBindings.Add (Application.AlternateForwardKey, Command.NextView);
|
|
|
-
|
|
|
- //KeyBindings.Add (Key.Tab.WithCtrl.WithShift, Command.PreviousView);
|
|
|
- //KeyBindings.Add (Application.AlternateBackwardKey, Command.PreviousView);
|
|
|
-
|
|
|
KeyBindings.Add (Key.Z.WithCtrl, Command.Undo);
|
|
|
KeyBindings.Add (Key.R.WithCtrl, Command.Redo);
|
|
|
|
|
@@ -5365,16 +5357,6 @@ public class TextView : View
|
|
|
DoNeededAction ();
|
|
|
}
|
|
|
|
|
|
- private bool MoveNextView ()
|
|
|
- {
|
|
|
- if (Application.OverlappedTop is { })
|
|
|
- {
|
|
|
- return SuperView?.FocusNext () == true;
|
|
|
- }
|
|
|
-
|
|
|
- return false;
|
|
|
- }
|
|
|
-
|
|
|
private void MovePageDown ()
|
|
|
{
|
|
|
int nPageDnShift = Viewport.Height - 1;
|
|
@@ -5431,16 +5413,6 @@ public class TextView : View
|
|
|
DoNeededAction ();
|
|
|
}
|
|
|
|
|
|
- private bool MovePreviousView ()
|
|
|
- {
|
|
|
- if (Application.OverlappedTop is { })
|
|
|
- {
|
|
|
- return SuperView?.FocusPrev () == true;
|
|
|
- }
|
|
|
-
|
|
|
- return false;
|
|
|
- }
|
|
|
-
|
|
|
private void MoveRight ()
|
|
|
{
|
|
|
List<RuneCell> currentLine = GetCurrentLine ();
|
|
@@ -5617,7 +5589,7 @@ public class TextView : View
|
|
|
|
|
|
if (!AllowsTab || _isReadOnly)
|
|
|
{
|
|
|
- return ProcessMovePreviousView ();
|
|
|
+ return false;
|
|
|
}
|
|
|
|
|
|
if (CurrentColumn > 0)
|
|
@@ -5889,21 +5861,7 @@ public class TextView : View
|
|
|
StartSelecting ();
|
|
|
MoveLeft ();
|
|
|
}
|
|
|
-
|
|
|
- private bool ProcessMoveNextView ()
|
|
|
- {
|
|
|
- ResetColumnTrack ();
|
|
|
-
|
|
|
- return MoveNextView ();
|
|
|
- }
|
|
|
-
|
|
|
- private bool ProcessMovePreviousView ()
|
|
|
- {
|
|
|
- ResetColumnTrack ();
|
|
|
-
|
|
|
- return MovePreviousView ();
|
|
|
- }
|
|
|
-
|
|
|
+
|
|
|
private bool ProcessMoveRight ()
|
|
|
{
|
|
|
// if the user presses Right (without any control keys)
|
|
@@ -6163,7 +6121,7 @@ public class TextView : View
|
|
|
|
|
|
if (!AllowsTab || _isReadOnly)
|
|
|
{
|
|
|
- return ProcessMoveNextView ();
|
|
|
+ return false;
|
|
|
}
|
|
|
|
|
|
InsertText (new Key ((KeyCode)'\t'));
|
|
@@ -6369,13 +6327,6 @@ public class TextView : View
|
|
|
private void TextView_Initialized (object sender, EventArgs e)
|
|
|
{
|
|
|
Autocomplete.HostControl = this;
|
|
|
-
|
|
|
- if (Application.Top is { })
|
|
|
- {
|
|
|
- Application.Top.AlternateForwardKeyChanged += Top_AlternateForwardKeyChanged!;
|
|
|
- Application.Top.AlternateBackwardKeyChanged += Top_AlternateBackwardKeyChanged!;
|
|
|
- }
|
|
|
-
|
|
|
OnContentsChanged ();
|
|
|
}
|
|
|
|
|
@@ -6393,9 +6344,6 @@ public class TextView : View
|
|
|
_selectionStartRow = CurrentRow;
|
|
|
}
|
|
|
|
|
|
- private void Top_AlternateBackwardKeyChanged (object sender, KeyChangedEventArgs e) { KeyBindings.ReplaceKey (e.OldKey, e.NewKey); }
|
|
|
- private void Top_AlternateForwardKeyChanged (object sender, KeyChangedEventArgs e) { KeyBindings.ReplaceKey (e.OldKey, e.NewKey); }
|
|
|
-
|
|
|
// Tries to snap the cursor to the tracking column
|
|
|
private void TrackColumn ()
|
|
|
{
|