From 510c4c87a9bf1d4dbb9dbe3086899dd9cdf249e3 Mon Sep 17 00:00:00 2001 From: zueuk Date: Sun, 18 Sep 2005 13:26:14 +0000 Subject: [PATCH] AT LAST! I fixed the keyboard input :-) --- 2.10/Source/CustomDrawControl.pas | 7 +++++++ 2.10/Source/Editor.pas | 27 +++++++++++---------------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/2.10/Source/CustomDrawControl.pas b/2.10/Source/CustomDrawControl.pas index d7648ee..05ec44d 100644 --- a/2.10/Source/CustomDrawControl.pas +++ b/2.10/Source/CustomDrawControl.pas @@ -13,6 +13,7 @@ type procedure WMEraseBkgnd(var Message: TWMEraseBkgnd); message WM_ERASEBKGND; // procedure WMSetFocus(var Message: TWMSetFocus); message WM_SETFOCUS; // procedure WMKillFocus(var Message: TWMKillFocus); message WM_KILLFOCUS; + procedure WMGetDlgCode(var Message: TMessage); message WM_GETDLGCODE; protected public @@ -54,6 +55,12 @@ begin end; } +procedure TCustomDrawControl.WMGetDlgCode(var Message: TMessage); +begin + inherited; + Message.Result := Message.Result or DLGC_WANTARROWS; +end; + procedure TCustomDrawControl.Paint; begin if Assigned(FOnPaint) then FOnPaint(Self); diff --git a/2.10/Source/Editor.pas b/2.10/Source/Editor.pas index bd2f804..d2147d1 100644 --- a/2.10/Source/Editor.pas +++ b/2.10/Source/Editor.pas @@ -370,11 +370,6 @@ var {$R *.DFM} -procedure DrawGraph; -begin - EditForm.TriangleView.Invalidate; -end; - { Triangle transformations } function OffsetTriangleRandom(t: TTriangle): TTriangle; @@ -1239,7 +1234,7 @@ procedure TEditForm.TriangleViewMouseMove(Sender: TObject; Shift: TShiftState; X, Y: integer); var vx, vy, fx, fy: double; - mt,mc: integer; + mt, mc: integer; i, j: integer; d: double; @@ -1336,19 +1331,21 @@ FoundCorner: if Shift = [ssShift] then // snap to axis begin if abs(fx-Pivot.X) > abs(fy-Pivot.Y) then begin - MainTriangles[SelectedTriangle].x[SelectedCorner] := fx; - MainTriangles[SelectedTriangle].y[SelectedCorner] := Pivot.Y; + vx := fx; + vy := Pivot.Y; end else begin - MainTriangles[SelectedTriangle].x[SelectedCorner] := Pivot.x; - MainTriangles[SelectedTriangle].y[SelectedCorner] := fy; + vx := Pivot.x; + vy := fy; end; end else begin // just move - MainTriangles[SelectedTriangle].x[SelectedCorner] := fx; - MainTriangles[SelectedTriangle].y[SelectedCorner] := fy; + vx := fx; + vy := fy; end; - StatusBar.Panels[2].Text := Format('Move: %3.3f ; %3.3f', [fx-(Pivot.X+oldx), fy-(Pivot.Y+oldy)]); + MainTriangles[SelectedTriangle].x[SelectedCorner] := vx; + MainTriangles[SelectedTriangle].y[SelectedCorner] := vy; + StatusBar.Panels[2].Text := Format('Move: %3.3f ; %3.3f', [vx-(Pivot.X+oldx), vy-(Pivot.Y+oldy)]); end; // -- HasChanged := True; @@ -2131,12 +2128,10 @@ begin FillRect(Rect); Font.Color := clWhite; - //TextOut(Rect.Left+h+2, Rect.Top, eqListBox.Items[Index]); - TextOut(Rect.Left+h+2, Rect.Top, IntToStr(Index+1)); // hack + TextOut(Rect.Left+h+2, Rect.Top, IntToStr(Index+1)); pen.Color := TrgColor; brush.Color := pen.Color shr 1 and $7f7f7f; - //pen.Style := psClear; ax:=Rect.Left+h-2; ay:=Rect.Top+1;