[Apophysis-cvs-commits] 2.10/Source CustomDrawControl.pas,1.1,1.2 Editor.pas,1.16,1.17

[Peter S. <zu...@us...>]

Update of /cvsroot/apophysis/2.10/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6217/Source

Modified Files:
	CustomDrawControl.pas Editor.pas 
Log Message:
AT LAST! I fixed the keyboard input :-)

Index: CustomDrawControl.pas
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/CustomDrawControl.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CustomDrawControl.pas	15 Sep 2005 14:23:32 -0000	1.1
--- CustomDrawControl.pas	18 Sep 2005 13:26:14 -0000	1.2
***************
*** 14,17 ****
--- 14,18 ----
  //    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
  
***************
*** 55,58 ****
--- 56,65 ----
  }
  
+ procedure TCustomDrawControl.WMGetDlgCode(var Message: TMessage);
+ begin
+   inherited;
+   Message.Result :=  Message.Result or DLGC_WANTARROWS;
+ end;
+ 
  procedure TCustomDrawControl.Paint;
  begin

Index: Editor.pas
===================================================================
RCS file: /cvsroot/apophysis/2.10/Source/Editor.pas,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Editor.pas	18 Sep 2005 06:05:44 -0000	1.16
--- Editor.pas	18 Sep 2005 13:26:14 -0000	1.17
***************
*** 371,379 ****
  {$R *.DFM}
  
- procedure DrawGraph;
- begin
-   EditForm.TriangleView.Invalidate;
- end;
- 
  { Triangle transformations }
  
--- 371,374 ----
***************
*** 1240,1244 ****
  var
    vx, vy, fx, fy: double;
!   mt,mc: integer;
  
    i, j: integer;
--- 1235,1239 ----
  var
    vx, vy, fx, fy: double;
!   mt, mc: integer;
  
    i, j: integer;
***************
*** 1337,1353 ****
        begin
          if abs(fx-Pivot.X) > abs(fy-Pivot.Y) then begin
!           MainTriangles[SelectedTriangle].x[SelectedCorner] := fx;
!           MainTriangles[SelectedTriangle].y[SelectedCorner] := Pivot.Y;
          end
          else begin
!           MainTriangles[SelectedTriangle].x[SelectedCorner] := Pivot.x;
!           MainTriangles[SelectedTriangle].y[SelectedCorner] := fy;
          end;
        end
        else begin // just move
!         MainTriangles[SelectedTriangle].x[SelectedCorner] := fx;
!         MainTriangles[SelectedTriangle].y[SelectedCorner] := fy;
        end;
!       StatusBar.Panels[2].Text := Format('Move: %3.3f ; %3.3f', [fx-(Pivot.X+oldx), fy-(Pivot.Y+oldy)]);
      end;
      // --
--- 1332,1350 ----
        begin
          if abs(fx-Pivot.X) > abs(fy-Pivot.Y) then begin
!           vx := fx;
!           vy := Pivot.Y;
          end
          else begin
!           vx := Pivot.x;
!           vy := fy;
          end;
        end
        else begin // just move
!         vx := fx;
!         vy := fy;
        end;
!       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;
      // --
***************
*** 2132,2141 ****
  
      Font.Color := clWhite;
!     //TextOut(Rect.Left+h+2, Rect.Top, eqListBox.Items[Index]);
!     TextOut(Rect.Left+h+2, Rect.Top, IntToStr(Index+1)); // hack
  
      pen.Color := TrgColor;
      brush.Color := pen.Color shr 1 and $7f7f7f;
-     //pen.Style := psClear;
  
      ax:=Rect.Left+h-2;
--- 2129,2136 ----
  
      Font.Color := clWhite;
!     TextOut(Rect.Left+h+2, Rect.Top, IntToStr(Index+1));
  
      pen.Color := TrgColor;
      brush.Color := pen.Color shr 1 and $7f7f7f;
  
      ax:=Rect.Left+h-2;