Added a new combobox to select what happens when pressing the ENTER (RETURN) key while NOT editing cells in the grid. Also made more robust

Author: davidberneda

.gitignore

@@ -46,3 +46,4 @@ src/
 
 demos/FireMonkey/TeeGridFeatures/Win32/
 *.rsm
+demos/VirtualData/Custom Sorting/__recovery/

demos/FireMonkey/Cell Editors/Unit_Editors.fmx

@@ -2,7 +2,7 @@ object FormCellEditors: TFormCellEditors
   Left = 0
   Top = 0
   Caption = 'TeeGrid - Custom Cell Editor Controls'
-  ClientHeight = 430
+  ClientHeight = 483
   ClientWidth = 640
   FormFactor.Width = 320
   FormFactor.Height = 480
@@ -11,12 +11,11 @@ object FormCellEditors: TFormCellEditors
   DesignerMasterStyle = 0
   object TeeGrid1: TTeeGrid
     Columns = <>
-    ReadOnly = False
     OnCellEditing = TeeGrid1CellEditing
     OnCellEdited = TeeGrid1CellEdited
     Align = Client
     Size.Width = 640.000000000000000000
-    Size.Height = 241.000000000000000000
+    Size.Height = 262.000000000000000000
     Size.PlatformDefault = False
     TabOrder = 0
     _Headers = (
@@ -54,9 +53,9 @@ object FormCellEditors: TFormCellEditors
   end
   object Layout2: TLayout
     Align = Bottom
-    Position.Y = 291.000000000000000000
+    Position.Y = 312.000000000000000000
     Size.Width = 640.000000000000000000
-    Size.Height = 139.000000000000000000
+    Size.Height = 171.000000000000000000
     Size.PlatformDefault = False
     TabOrder = 2
     object Text2: TText
@@ -126,12 +125,12 @@ object FormCellEditors: TFormCellEditors
       TextSettings.HorzAlign = Leading
     end
     object Label1: TLabel
-      Position.X = 48.000000000000000000
+      Position.X = 22.000000000000000000
       Position.Y = 107.000000000000000000
-      Size.Width = 89.000000000000000000
+      Size.Width = 115.000000000000000000
       Size.Height = 17.000000000000000000
       Size.PlatformDefault = False
-      Text = 'Enter Key:'
+      Text = 'Editing Enter Key:'
     end
     object CBEnterKey: TComboBox
       Items.Strings = (
@@ -141,11 +140,34 @@ object FormCellEditors: TFormCellEditors
       ItemIndex = 0
       Position.X = 144.000000000000000000
       Position.Y = 104.000000000000000000
-      Size.Width = 193.000000000000000000
+      Size.Width = 249.000000000000000000
       Size.Height = 22.000000000000000000
       Size.PlatformDefault = False
-      TabOrder = 8
+      TabOrder = 9
       OnChange = CBEnterKeyChange
     end
+    object Label2: TLabel
+      Position.X = 22.000000000000000000
+      Position.Y = 139.000000000000000000
+      Size.Width = 114.000000000000000000
+      Size.Height = 17.000000000000000000
+      Size.PlatformDefault = False
+      Text = 'Selecting Enter Key:'
+      TabOrder = 10
+    end
+    object CBSelectingEnterKey: TComboBox
+      Items.Strings = (
+        'Move to next cell (at right and below)'
+        'Move to cell below'
+        'Move to next cell (at right only)')
+      ItemIndex = 0
+      Position.X = 144.000000000000000000
+      Position.Y = 134.000000000000000000
+      Size.Width = 249.000000000000000000
+      Size.Height = 22.000000000000000000
+      Size.PlatformDefault = False
+      TabOrder = 8
+      OnChange = CBSelectingEnterKeyChange
+    end
   end
 end

demos/FireMonkey/Cell Editors/Unit_Editors.pas

@@ -27,6 +27,8 @@   TFormCellEditors = class(TForm)
     Text5: TText;
     Label1: TLabel;
     CBEnterKey: TComboBox;
+    Label2: TLabel;
+    CBSelectingEnterKey: TComboBox;
     procedure FormCreate(Sender: TObject);
     procedure CBCustomEditorsChange(Sender: TObject);
     procedure CBAutoEditChange(Sender: TObject);
@@ -38,6 +40,7 @@   TFormCellEditors = class(TForm)
     procedure TeeGrid1CellEdited(const Sender: TObject; const AEditor: TControl;
       const AColumn: TColumn; const ARow: Integer; var ChangeData: Boolean;
       var NewData: string);
+    procedure CBSelectingEnterKeyChange(Sender: TObject);
   private
     { Private declarations }
 
@@ -56,7 +59,7 @@ implementation
 uses
   Unit_Example_Data, Unit_Utils,
 
-  Tee.Grid;
+  Tee.Grid, Tee.Grid.Selection;
 
 procedure TFormCellEditors.CBAlwaysVisibleChange(Sender: TObject);
 begin
@@ -92,6 +95,11 @@ procedure TFormCellEditors.CBSelectedTextChange(Sender: TObject);
   TeeGrid1.Editing.Text.Selected:=CBSelectedText.IsChecked;
 end;
 
+procedure TFormCellEditors.CBSelectingEnterKeyChange(Sender: TObject);
+begin
+  TeeGrid1.Selected.EnterKey:=TSelectingEnter(CBSelectingEnterKey.ItemIndex);
+end;
+
 procedure TFormCellEditors.FormCreate(Sender: TObject);
 begin
   // Use random sample data
@@ -127,12 +135,18 @@ procedure TFormCellEditors.SetupCustomEditors;
 procedure TFormCellEditors.TeeGrid1CellEdited(const Sender: TObject;
   const AEditor: TControl; const AColumn: TColumn; const ARow: Integer;
   var ChangeData: Boolean; var NewData: string);
+var tmp : String;
 begin
   if AColumn=TeeGrid1.Columns['Height'] then
   begin
-    ChangeData:=False;
+    if AEditor is TTrackBar then
+    begin
+      ChangeData:=False;
 
-    TeeGrid1.Data.SetValue(AColumn,ARow,FloatToStr(TTrackBar(AEditor).Value*0.01));
+      tmp:=FloatToStr(TTrackBar(AEditor).Value*0.01);
+
+      TeeGrid1.Data.SetValue(AColumn,ARow,tmp);
+    end;
   end;
 end;
 
@@ -153,17 +167,17 @@ procedure TFormCellEditors.TeeGrid1CellEditing(const Sender: TObject;
                  tmpValue);
   end
   else
-  if AColumn=TeeGrid1.Columns['EyeColor'] then
+  if (AColumn=TeeGrid1.Columns['EyeColor']) and (AEditor is TComboColorBox)  then
      TComboColorBox(AEditor).Color:=Round(TeeGrid1.Data.AsFloat(AColumn,ARow))
   else
-  if AColumn=TeeGrid1.Columns['Height'] then
+  if (AColumn=TeeGrid1.Columns['Height']) and (AEditor is TTrackBar) then
   begin
     TTrackBar(AEditor).Min:=400;
     TTrackBar(AEditor).Max:=700;
     TTrackBar(AEditor).Value:=100*TeeGrid1.Data.AsFloat(AColumn,ARow);
   end
   else
-  if AColumn=TeeGrid1.Columns['Happiness'] then
+  if (AColumn=TeeGrid1.Columns['Happiness']) and (AEditor is TNumberBox) then
   begin
     TNumberBox(AEditor).ValueType:=TNumValueType.Float;
     TNumberBox(AEditor).Min:=0;

demos/VCL/Cell Editors/Unit_Editors.dfm

@@ -2,7 +2,7 @@ object FormCellEditors: TFormCellEditors
   Left = 0
   Top = 0
   Caption = 'TeeGrid - Cell Editors Example'
-  ClientHeight = 362
+  ClientHeight = 396
   ClientWidth = 726
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
@@ -17,7 +17,7 @@ object FormCellEditors: TFormCellEditors
     Left = 0
     Top = 41
     Width = 726
-    Height = 191
+    Height = 183
     Columns = <>
     OnCellEditing = TeeGrid1CellEditing
     OnCellEdited = TeeGrid1CellEdited
@@ -61,9 +61,9 @@ object FormCellEditors: TFormCellEditors
   end
   object Panel2: TPanel
     Left = 0
-    Top = 232
+    Top = 224
     Width = 726
-    Height = 130
+    Height = 172
     Align = alBottom
     TabOrder = 2
     object Label2: TLabel
@@ -92,11 +92,11 @@ object FormCellEditors: TFormCellEditors
         ' to another cells'
     end
     object Label5: TLabel
-      Left = 71
+      Left = 36
       Top = 102
-      Width = 50
+      Width = 85
       Height = 13
-      Caption = 'Enter key:'
+      Caption = 'Editing Enter key:'
     end
     object Label6: TLabel
       Left = 127
@@ -107,6 +107,13 @@ object FormCellEditors: TFormCellEditors
         'True = Cell editor using TEdit will select all text when showing' +
         ' it'
     end
+    object Label7: TLabel
+      Left = 25
+      Top = 129
+      Width = 96
+      Height = 13
+      Caption = 'Selecting Enter key:'
+    end
     object CBAutoEdit: TCheckBox
       Left = 24
       Top = 25
@@ -128,7 +135,7 @@ object FormCellEditors: TFormCellEditors
     object CBEnterKey: TComboBox
       Left = 127
       Top = 99
-      Width = 194
+      Width = 242
       Height = 21
       Style = csDropDownList
       ItemIndex = 0
@@ -176,5 +183,20 @@ object FormCellEditors: TFormCellEditors
       TabOrder = 6
       OnClick = Button3Click
     end
+    object CBSelectingEnter: TComboBox
+      Left = 127
+      Top = 126
+      Width = 242
+      Height = 21
+      Style = csDropDownList
+      ItemIndex = 0
+      TabOrder = 7
+      Text = 'Move to next cell at right and bottom'
+      OnChange = CBSelectingEnterChange
+      Items.Strings = (
+        'Move to next cell at right and bottom'
+        'Move to cell below'
+        'Move to next cell at right')
+    end
   end
 end

demos/VCL/Cell Editors/Unit_Editors.pas

@@ -53,6 +53,8 @@   TFormCellEditors = class(TForm)
     Button1: TButton;
     Button2: TButton;
     Button3: TButton;
+    Label7: TLabel;
+    CBSelectingEnter: TComboBox;
     procedure FormCreate(Sender: TObject);
     procedure CBAutoEditClick(Sender: TObject);
     procedure CBAlwaysVisibleClick(Sender: TObject);
@@ -67,6 +69,7 @@   TFormCellEditors = class(TForm)
     procedure Button1Click(Sender: TObject);
     procedure Button2Click(Sender: TObject);
     procedure Button3Click(Sender: TObject);
+    procedure CBSelectingEnterChange(Sender: TObject);
   private
     { Private declarations }
 
@@ -87,7 +90,7 @@ implementation
 
   VCLTee.Painter,
 
-  Tee.Grid, System.UITypes, Tee.Grid.Rows, Tee.Format;
+  Tee.Grid, System.UITypes, Tee.Grid.Rows, Tee.Format, Tee.Grid.Selection;
 
 procedure TFormCellEditors.Button1Click(Sender: TObject);
 var cell : TCell;
@@ -166,6 +169,12 @@ procedure TFormCellEditors.CBSelectedTextClick(Sender: TObject);
   TeeGrid1.Editing.Text.Selected:=CBSelectedText.Checked;
 end;
 
+procedure TFormCellEditors.CBSelectingEnterChange(Sender: TObject);
+begin
+  // Several options when pressing the Enter key while NOT editing a cell (selecting cells only)
+  TeeGrid1.Selected.EnterKey:=TSelectingEnter(CBSelectingEnter.ItemIndex);
+end;
+
 procedure TFormCellEditors.FormCreate(Sender: TObject);
 begin
 // Example, switch from Windows GDI+ graphics to GDI:
@@ -215,12 +224,15 @@ procedure TFormCellEditors.TeeGrid1CellEdited(const Sender: TObject;
   // Example, retrieve position from TrackBar
   if AColumn=TeeGrid1.Columns['Height'] then
   begin
-    tmp:=0.01*TTrackBar(AEditor).Position;
+    if AEditor is TTrackBar then
+    begin
+      tmp:=0.01*TTrackBar(AEditor).Position;
 
-    TeeGrid1.Data.SetValue(AColumn,ARow,FloatToStr(tmp));
+      TeeGrid1.Data.SetValue(AColumn,ARow,FloatToStr(tmp));
 
-    // Set to False, do not change grid cell data
-    ChangeData:=False;
+      // Set to False, do not change grid cell data
+      ChangeData:=False;
+    end;
   end
   else
   if AEditor is TComboBox then
@@ -287,7 +299,8 @@ procedure TFormCellEditors.TeeGrid1CellEditing(const Sender: TObject;
 
   // Example, use a trackbar as cell editor
   if AColumn=TeeGrid1.Columns['Height'] then
-     SetupTrackBar(TTrackBar(AEditor));
+     if AEditor is TTrackBar then
+        SetupTrackBar(TTrackBar(AEditor));
 end;
 
 { TComboBox }