Zoom out added

fixed; B1199407  'Use current' gradient option bug
This commit is contained in:
ronaldhordijk
2005-06-05 06:52:05 +00:00
parent b9c5631e6d
commit dec7ba3333
2 changed files with 114 additions and 72 deletions

View File

@ -39,7 +39,7 @@ const
RS_VO = 3;
type
TMouseMoveState = (msUsual, msZoomWindow, msZoomWindowMove, msDrag, msDragMove, msRotate, msRotateMove);
TMouseMoveState = (msUsual, msZoomWindow, msZoomOutWindow, msZoomWindowMove, msZoomOutWindowMove, msDrag, msDragMove, msRotate, msRotateMove);
type
TWin32Version = (wvUnknown, wvWin95, wvWin98, wvWinNT, wvWin2000, wvWinXP);
@ -177,6 +177,8 @@ type
tbDrag: TToolButton;
tbRotate: TToolButton;
mnuimage: TMenuItem;
tbzoomoutwindow: TToolButton;
procedure tbzoomoutwindowClick(Sender: TObject);
procedure mnuimageClick(Sender: TObject);
procedure mnuExitClick(Sender: TObject);
procedure mnuSaveUPRClick(Sender: TObject);
@ -661,6 +663,7 @@ var
*)
begin
cp1.Free;
cp1 := nil;
cp1 := RandomFlame(MainCP, alg);
(*
Min := randMinTransforms;
@ -4005,6 +4008,13 @@ begin
DrawZoomWindow(FSelectRect);
FMouseMoveState := msZoomWindowMove;
end;
msZoomOutWindow:
begin
FSelectRect.TopLeft := Point(x, y);
FSelectRect.BottomRight := Point(x, y);
DrawZoomWindow(FSelectRect);
FMouseMoveState := msZoomOutWindowMove;
end;
msDrag:
begin
if not assigned(FViewBMP) then
@ -4053,7 +4063,8 @@ var
FOffs : TPoint;
begin
case FMouseMoveState of
msZoomWindowMove:
msZoomWindowMove,
msZoomOutWindowMove:
begin
DrawZoomWindow(FSelectRect);
FSelectRect.BottomRight := Point(x, y);
@ -4107,6 +4118,22 @@ begin
UpdateUndo;
MainCp.ZoomtoRect(FSelectRect);
RedrawTimer.Enabled := True;
UpdateWindows;
end;
msZoomOutWindowMove:
begin
DrawZoomWindow(FSelectRect);
FSelectRect.BottomRight := Point(x, y);
FMouseMoveState := msZoomOutWindow;
if (abs(FSelectRect.Left - FSelectRect.Right) < 10) or
(abs(FSelectRect.Top - FSelectRect.Bottom) < 10) then
Exit; // zoom to much or double clicked
StopThread;
UpdateUndo;
MainCp.ZoomOuttoRect(FSelectRect);
RedrawTimer.Enabled := True;
UpdateWindows;
end;
@ -4212,6 +4239,12 @@ begin
FMouseMoveState := msZoomWindow;
end;
///////////////////////////////////////////////////////////////////////////////
procedure TMainForm.tbzoomoutwindowClick(Sender: TObject);
begin
FMouseMoveState := msZoomOutWindow;
end;
///////////////////////////////////////////////////////////////////////////////
procedure TMainForm.tbDragClick(Sender: TObject);
begin
@ -4256,5 +4289,6 @@ begin
UpdateWindows;
end;
///////////////////////////////////////////////////////////////////////////////
end.