opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-06 18:24:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do not pass <Enter> key to parent grid, if radio button or checkbox on default editor is currently focused. Fixes issue #1605.

Browse Source
This commit is contained in:
Ansgar Becker
2010-01-17 13:31:49 +00:00
parent 0d8653db6a
commit 5890aad90f
1 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
source/grideditlinks.pas
View File

@ -10,6 +10,15 @@ uses
mysql_structures, helpers, texteditor, bineditor; mysql_structures, helpers, texteditor, bineditor;
type type
// Radio buttons and checkboxes which do not pass <Enter> key to their parent control
// so a OnKeyDown event using <Enter> has the chance to end editing.
TAllKeysRadioButton = class(TRadioButton)
procedure WMGetDlgCode(var Msg: TMessage); message WM_GETDLGCODE;
end;
TAllKeysCheckBox = class(TCheckBox)
procedure WMGetDlgCode(var Msg: TMessage); message WM_GETDLGCODE;
end;
TBaseGridEditorLink = class(TInterfacedObject, IVTEditLink) TBaseGridEditorLink = class(TInterfacedObject, IVTEditLink)
private private
FParentForm: TWinControl; // A back reference to the main form FParentForm: TWinControl; // A back reference to the main form
@ -134,8 +143,8 @@ type
TColumnDefaultEditorLink = class(TBaseGridEditorLink) TColumnDefaultEditorLink = class(TBaseGridEditorLink)
private private
FPanel: TPanel; FPanel: TPanel;
FRadioNothing, FRadioText, FRadioNULL, FRadioCurTS, FRadioAutoInc: TRadioButton; FRadioNothing, FRadioText, FRadioNULL, FRadioCurTS, FRadioAutoInc: TAllKeysRadioButton;
FCheckCurTS: TCheckbox; FCheckCurTS: TAllKeysCheckbox;
FMemoText: TMemo; FMemoText: TMemo;
FBtnOK, FBtnCancel: TButton; FBtnOK, FBtnCancel: TButton;
procedure RadioClick(Sender: TObject); procedure RadioClick(Sender: TObject);
@ -183,6 +192,19 @@ function GetColumnDefaultClause(DefaultType: TColumnDefaultType; Text: String):
implementation implementation
procedure TAllKeysRadioButton.WMGetDlgCode(var Msg: TMessage);
begin
inherited;
Msg.Result := Msg.Result or DLGC_WANTALLKEYS;
end;
procedure TAllKeysCheckBox.WMGetDlgCode(var Msg: TMessage);
begin
inherited;
Msg.Result := Msg.Result or DLGC_WANTALLKEYS;
end;
constructor TBaseGridEditorLink.Create; constructor TBaseGridEditorLink.Create;
begin begin
@ -992,20 +1014,22 @@ begin
FPanel.BevelOuter := bvNone; FPanel.BevelOuter := bvNone;
FMainControl := FPanel; FMainControl := FPanel;
FRadioNothing := TRadioButton.Create(FPanel); FRadioNothing := TAllKeysRadioButton.Create(FPanel);
FRadioNothing.Parent := FPanel; FRadioNothing.Parent := FPanel;
FRadioNothing.Top := m; FRadioNothing.Top := m;
FRadioNothing.Left := m; FRadioNothing.Left := m;
FRadioNothing.Width := FRadioNothing.Parent.Width - 2 * FRadioNothing.Left; FRadioNothing.Width := FRadioNothing.Parent.Width - 2 * FRadioNothing.Left;
FRadioNothing.OnClick := RadioClick; FRadioNothing.OnClick := RadioClick;
FRadioNothing.OnKeyDown := DoKeyDown;
FRadioNothing.Caption := 'No default value'; FRadioNothing.Caption := 'No default value';
FRadioText := TRadioButton.Create(FPanel); FRadioText := TAllKeysRadioButton.Create(FPanel);
FRadioText.Parent := FPanel; FRadioText.Parent := FPanel;
FRadioText.Top := FRadioNothing.Top + FRadioNothing.Height + m;; FRadioText.Top := FRadioNothing.Top + FRadioNothing.Height + m;;
FRadioText.Left := m; FRadioText.Left := m;
FRadioText.Width := FRadioText.Parent.Width - 2 * FRadioText.Left; FRadioText.Width := FRadioText.Parent.Width - 2 * FRadioText.Left;
FRadioText.OnClick := RadioClick; FRadioText.OnClick := RadioClick;
FRadioText.OnKeyDown := DoKeyDown;
FRadioText.Caption := 'Custom:'; FRadioText.Caption := 'Custom:';
FMemoText := TMemo.Create(FPanel); FMemoText := TMemo.Create(FPanel);
@ -1017,36 +1041,40 @@ begin
FMemoText.ScrollBars := ssVertical; FMemoText.ScrollBars := ssVertical;
FMemoText.OnChange := TextChange; FMemoText.OnChange := TextChange;
FRadioNull := TRadioButton.Create(FPanel); FRadioNull := TAllKeysRadioButton.Create(FPanel);
FRadioNull.Parent := FPanel; FRadioNull.Parent := FPanel;
FRadioNull.Top := FMemoText.Top + FMemoText.Height + m; FRadioNull.Top := FMemoText.Top + FMemoText.Height + m;
FRadioNull.Left := m; FRadioNull.Left := m;
FRadioNull.Width := FRadioNull.Parent.Width - 2 * FRadioNull.Left; FRadioNull.Width := FRadioNull.Parent.Width - 2 * FRadioNull.Left;
FRadioNull.OnClick := RadioClick; FRadioNull.OnClick := RadioClick;
FRadioNull.OnKeyDown := DoKeyDown;
FRadioNull.Caption := 'NULL'; FRadioNull.Caption := 'NULL';
FRadioCurTS := TRadioButton.Create(FPanel); FRadioCurTS := TAllKeysRadioButton.Create(FPanel);
FRadioCurTS.Parent := FPanel; FRadioCurTS.Parent := FPanel;
FRadioCurTS.Top := FRadioNull.Top + FRadioNull.Height + m; FRadioCurTS.Top := FRadioNull.Top + FRadioNull.Height + m;
FRadioCurTS.Left := m; FRadioCurTS.Left := m;
FRadioCurTS.Width := FRadioCurTS.Parent.Width - 2 * FRadioCurTS.Left; FRadioCurTS.Width := FRadioCurTS.Parent.Width - 2 * FRadioCurTS.Left;
FRadioCurTS.OnClick := RadioClick; FRadioCurTS.OnClick := RadioClick;
FRadioCurTS.OnKeyDown := DoKeyDown;
FRadioCurTS.Caption := 'CURRENT_TIMESTAMP'; FRadioCurTS.Caption := 'CURRENT_TIMESTAMP';
FCheckCurTS := TCheckbox.Create(FPanel); FCheckCurTS := TAllKeysCheckbox.Create(FPanel);
FCheckCurTS.Parent := FPanel; FCheckCurTS.Parent := FPanel;
FCheckCurTS.Top := FRadioCurTS.Top + FRadioCurTS.Height + m; FCheckCurTS.Top := FRadioCurTS.Top + FRadioCurTS.Height + m;
FCheckCurTS.Left := m; FCheckCurTS.Left := m;
FCheckCurTS.Width := FCheckCurTS.Parent.Width - 2 * FCheckCurTS.Left; FCheckCurTS.Width := FCheckCurTS.Parent.Width - 2 * FCheckCurTS.Left;
FCheckCurTS.OnClick := RadioClick; FCheckCurTS.OnClick := RadioClick;
FCheckCurTS.OnKeyDown := DoKeyDown;
FCheckCurTS.Caption := 'ON UPDATE CURRENT_TIMESTAMP'; FCheckCurTS.Caption := 'ON UPDATE CURRENT_TIMESTAMP';
FRadioAutoInc := TRadioButton.Create(FPanel); FRadioAutoInc := TAllKeysRadioButton.Create(FPanel);
FRadioAutoInc.Parent := FPanel; FRadioAutoInc.Parent := FPanel;
FRadioAutoInc.Top := FCheckCurTS.Top + FCheckCurTS.Height + m; FRadioAutoInc.Top := FCheckCurTS.Top + FCheckCurTS.Height + m;
FRadioAutoInc.Left := m; FRadioAutoInc.Left := m;
FRadioAutoInc.Width := FRadioAutoInc.Parent.Width - 2 * FRadioAutoInc.Left; FRadioAutoInc.Width := FRadioAutoInc.Parent.Width - 2 * FRadioAutoInc.Left;
FRadioAutoInc.OnClick := RadioClick; FRadioAutoInc.OnClick := RadioClick;
FRadioAutoInc.OnKeyDown := DoKeyDown;
FRadioAutoInc.Caption := 'AUTO_INCREMENT'; FRadioAutoInc.Caption := 'AUTO_INCREMENT';
FBtnOk := TButton.Create(FPanel); FBtnOk := TButton.Create(FPanel);