UPD: Workarounds for keys and mouse clicks after drag&drop not needed anymore, bugs were fixed in Lazarus 1.0.

This commit is contained in:
Alexander Koblov 2013-01-20 09:17:52 +00:00
commit cdbe6feafb
4 changed files with 26 additions and 80 deletions

View file

@ -13,15 +13,15 @@ object frmHardLink: TfrmHardLink
KeyPreview = True
OnShow = FormShow
Position = poScreenCenter
LCLVersion = '1.1'
LCLVersion = '1.0.4.0'
object lblExistingFile: TLabel
AnchorSideLeft.Control = edtExistingFile
AnchorSideTop.Control = edtLinkToCreate
AnchorSideTop.Side = asrBottom
Left = 6
Height = 18
Top = 64
Width = 243
Height = 16
Top = 59
Width = 240
BorderSpacing.Top = 6
Caption = '&Destination that the link will point to'
FocusControl = edtExistingFile
@ -31,9 +31,9 @@ object frmHardLink: TfrmHardLink
AnchorSideLeft.Control = edtLinkToCreate
AnchorSideTop.Control = Owner
Left = 6
Height = 18
Height = 16
Top = 6
Width = 64
Width = 69
BorderSpacing.Top = 6
Caption = '&Link name'
FocusControl = edtLinkToCreate
@ -46,8 +46,8 @@ object frmHardLink: TfrmHardLink
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 6
Height = 28
Top = 88
Height = 25
Top = 81
Width = 500
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
@ -63,8 +63,8 @@ object frmHardLink: TfrmHardLink
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 6
Height = 28
Top = 30
Height = 25
Top = 28
Width = 500
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
@ -78,8 +78,8 @@ object frmHardLink: TfrmHardLink
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = btnCancel
Left = 300
Height = 35
Top = 128
Height = 36
Top = 118
Width = 100
Anchors = [akTop, akRight]
AutoSize = True
@ -93,7 +93,6 @@ object frmHardLink: TfrmHardLink
Kind = bkOK
ModalResult = 1
OnClick = btnOKClick
OnMouseUp = btnOKMouseUp
TabOrder = 2
end
object btnCancel: TBitBtn
@ -103,7 +102,7 @@ object frmHardLink: TfrmHardLink
AnchorSideRight.Side = asrBottom
Left = 406
Height = 36
Top = 128
Top = 118
Width = 100
Anchors = [akTop, akRight]
AutoSize = True
@ -115,7 +114,6 @@ object frmHardLink: TfrmHardLink
Constraints.MinWidth = 100
Kind = bkCancel
ModalResult = 2
OnMouseUp = btnCancelMouseUp
TabOrder = 3
end
end

View file

@ -16,11 +16,7 @@ type
edtLinkToCreate: TEdit;
btnOK: TBitBtn;
btnCancel: TBitBtn;
procedure btnCancelMouseUp(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
procedure btnOKClick(Sender: TObject);
procedure btnOKMouseUp(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
procedure FormShow(Sender: TObject);
private
@ -90,27 +86,6 @@ begin
end;
end;
procedure TfrmHardLink.btnCancelMouseUp(Sender: TObject;
Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
begin
{$IF DEFINED(LCLGTK) or DEFINED(LCLGTK2)}
if (Button = mbLeft) and (Sender = FindLCLControl(Mouse.CursorPos)) then
ModalResult := btnCancel.ModalResult;
{$ENDIF}
end;
procedure TfrmHardLink.btnOKMouseUp(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
begin
{$IF DEFINED(LCLGTK) or DEFINED(LCLGTK2)}
if (Button = mbLeft) and (Sender = FindLCLControl(Mouse.CursorPos)) then
begin
ModalResult := btnOK.ModalResult;
btnOKClick(Sender);
end;
{$ENDIF}
end;
procedure TfrmHardLink.FormShow(Sender: TObject);
begin
edtLinkToCreate.SelectAll;

View file

@ -17,15 +17,15 @@ object frmSymLink: TfrmSymLink
KeyPreview = True
OnShow = FormShow
Position = poScreenCenter
LCLVersion = '1.1'
LCLVersion = '1.0.4.0'
object lblExistingFile: TLabel
AnchorSideLeft.Control = edtExistingFile
AnchorSideTop.Control = edtLinkToCreate
AnchorSideTop.Side = asrBottom
Left = 6
Height = 18
Top = 64
Width = 243
Height = 16
Top = 59
Width = 240
BorderSpacing.Top = 6
Caption = '&Destination that the link will point to'
FocusControl = edtExistingFile
@ -35,9 +35,9 @@ object frmSymLink: TfrmSymLink
AnchorSideLeft.Control = edtLinkToCreate
AnchorSideTop.Control = Owner
Left = 6
Height = 18
Height = 16
Top = 6
Width = 64
Width = 69
BorderSpacing.Top = 6
Caption = '&Link name'
FocusControl = edtLinkToCreate
@ -50,8 +50,8 @@ object frmSymLink: TfrmSymLink
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 6
Height = 28
Top = 88
Height = 25
Top = 81
Width = 590
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
@ -67,8 +67,8 @@ object frmSymLink: TfrmSymLink
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 6
Height = 28
Top = 30
Height = 25
Top = 28
Width = 590
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
@ -82,8 +82,8 @@ object frmSymLink: TfrmSymLink
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = btnCancel
Left = 390
Height = 35
Top = 128
Height = 36
Top = 118
Width = 100
Anchors = [akTop, akRight]
AutoSize = True
@ -97,7 +97,6 @@ object frmSymLink: TfrmSymLink
Kind = bkOK
ModalResult = 1
OnClick = btnOKClick
OnMouseUp = btnOKMouseUp
TabOrder = 2
end
object btnCancel: TBitBtn
@ -107,7 +106,7 @@ object frmSymLink: TfrmSymLink
AnchorSideRight.Side = asrBottom
Left = 496
Height = 36
Top = 128
Top = 118
Width = 100
Anchors = [akTop, akRight]
AutoSize = True
@ -119,7 +118,6 @@ object frmSymLink: TfrmSymLink
Constraints.MinWidth = 100
Kind = bkCancel
ModalResult = 2
OnMouseUp = btnCancelMouseUp
TabOrder = 3
end
end

View file

@ -16,11 +16,7 @@ type
edtLinkToCreate: TEdit;
btnOK: TBitBtn;
btnCancel: TBitBtn;
procedure btnCancelMouseUp(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
procedure btnOKClick(Sender: TObject);
procedure btnOKMouseUp(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
procedure FormShow(Sender: TObject);
private
@ -90,27 +86,6 @@ begin
end;
end;
procedure TfrmSymLink.btnCancelMouseUp(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
begin
{$IF DEFINED(LCLGTK) or DEFINED(LCLGTK2)}
if (Button = mbLeft) and (Sender = FindLCLControl(Mouse.CursorPos)) then
ModalResult := btnCancel.ModalResult;
{$ENDIF}
end;
procedure TfrmSymLink.btnOKMouseUp(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
begin
{$IF DEFINED(LCLGTK) or DEFINED(LCLGTK2)}
if (Button = mbLeft) and (Sender = FindLCLControl(Mouse.CursorPos)) then
begin
ModalResult := btnOK.ModalResult;
btnOKClick(Sender);
end;
{$ENDIF}
end;
procedure TfrmSymLink.FormShow(Sender: TObject);
begin
edtLinkToCreate.SelectAll;