some editor changes & fixes

This commit is contained in:
zueuk 2005-09-21 13:42:24 +00:00
parent 6f6de8c723
commit 7bedaf4218
4 changed files with 377 additions and 410 deletions

View File

@ -11,8 +11,8 @@ type
FOnPaint: TNotifyEvent; FOnPaint: TNotifyEvent;
procedure WMEraseBkgnd(var Message: TWMEraseBkgnd); message WM_ERASEBKGND; procedure WMEraseBkgnd(var Message: TWMEraseBkgnd); message WM_ERASEBKGND;
// procedure WMSetFocus(var Message: TWMSetFocus); message WM_SETFOCUS; procedure WMSetFocus(var Message: TWMSetFocus); message WM_SETFOCUS;
// procedure WMKillFocus(var Message: TWMKillFocus); message WM_KILLFOCUS; procedure WMKillFocus(var Message: TWMKillFocus); message WM_KILLFOCUS;
procedure WMGetDlgCode(var Message: TMessage); message WM_GETDLGCODE; procedure WMGetDlgCode(var Message: TMessage); message WM_GETDLGCODE;
protected protected
@ -25,7 +25,7 @@ type
property OnDblClick; property OnDblClick;
property OnKeyDown; property OnKeyDown;
// property OnKeyPress; // property OnKeyPress;
// property OnKeyUp; property OnKeyUp;
property OnMouseDown; property OnMouseDown;
property OnMouseMove; property OnMouseMove;
property OnMouseUp; property OnMouseUp;
@ -43,7 +43,6 @@ begin
Message.Result := 1; Message.Result := 1;
end; end;
{
procedure TCustomDrawControl.WMSetFocus(var Message: TWMSetFocus); procedure TCustomDrawControl.WMSetFocus(var Message: TWMSetFocus);
begin begin
Invalidate; Invalidate;
@ -51,9 +50,9 @@ end;
procedure TCustomDrawControl.WMKillFocus(var Message: TWMKillFocus); procedure TCustomDrawControl.WMKillFocus(var Message: TWMKillFocus);
begin begin
if assigned(OnExit) then OnExit(self);
Invalidate; Invalidate;
end; end;
}
procedure TCustomDrawControl.WMGetDlgCode(var Message: TMessage); procedure TCustomDrawControl.WMGetDlgCode(var Message: TMessage);
begin begin

View File

@ -46,6 +46,8 @@ object EditForm: TEditForm
OnClose = FormClose OnClose = FormClose
OnCreate = FormCreate OnCreate = FormCreate
OnDestroy = FormDestroy OnDestroy = FormDestroy
OnKeyDown = EditKeyDown
OnKeyPress = EditKeyPress
OnResize = FormResize OnResize = FormResize
OnShow = FormShow OnShow = FormShow
PixelsPerInch = 96 PixelsPerInch = 96
@ -172,9 +174,12 @@ object EditForm: TEditForm
Top = 0 Top = 0
Hint = 'Move Triangle' Hint = 'Move Triangle'
Caption = 'Move' Caption = 'Move'
Down = True
Grouped = True
ImageIndex = 6 ImageIndex = 6
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
Style = tbsCheck
OnClick = tbEditModeClick OnClick = tbEditModeClick
end end
object tbRotate: TToolButton object tbRotate: TToolButton
@ -182,9 +187,11 @@ object EditForm: TEditForm
Top = 0 Top = 0
Hint = 'Rotate triangle' Hint = 'Rotate triangle'
Caption = 'Rotate' Caption = 'Rotate'
Grouped = True
ImageIndex = 7 ImageIndex = 7
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
Style = tbsCheck
OnClick = tbEditModeClick OnClick = tbEditModeClick
end end
object tbScale: TToolButton object tbScale: TToolButton
@ -192,9 +199,11 @@ object EditForm: TEditForm
Top = 0 Top = 0
Hint = 'Scale triangle' Hint = 'Scale triangle'
Caption = 'Scale' Caption = 'Scale'
Grouped = True
ImageIndex = 8 ImageIndex = 8
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
Style = tbsCheck
OnClick = tbEditModeClick OnClick = tbEditModeClick
end end
object ToolButton5: TToolButton object ToolButton5: TToolButton
@ -1092,6 +1101,8 @@ object EditForm: TEditForm
ItemIndex = 3 ItemIndex = 3
TabOrder = 9 TabOrder = 9
Text = '0.1' Text = '0.1'
OnExit = txtValidateValue
OnKeyPress = txtValKeyPress
Items.Strings = ( Items.Strings = (
'1' '1'
'0.5' '0.5'
@ -1110,6 +1121,8 @@ object EditForm: TEditForm
ItemIndex = 1 ItemIndex = 1
TabOrder = 8 TabOrder = 8
Text = '15' Text = '15'
OnExit = txtValidateValue
OnKeyPress = txtValKeyPress
Items.Strings = ( Items.Strings = (
'5' '5'
'15' '15'
@ -1126,14 +1139,16 @@ object EditForm: TEditForm
ItemHeight = 13 ItemHeight = 13
ItemIndex = 1 ItemIndex = 1
TabOrder = 10 TabOrder = 10
Text = '0.1' Text = '110'
OnExit = txtValidateValue
OnKeyPress = txtValKeyPress
Items.Strings = ( Items.Strings = (
'0.05' '105'
'0.1' '110'
'0.25' '125'
'0.5' '150'
'0.75' '175'
'0.9') '200')
end end
end end
end end

File diff suppressed because it is too large Load Diff

View File

@ -1802,9 +1802,6 @@ begin
if EditForm.Visible then EditForm.UpdateDisplay(true); // preview only if EditForm.Visible then EditForm.UpdateDisplay(true); // preview only
end; end;
if AdjustForm.Visible then AdjustForm.UpdateDisplay; if AdjustForm.Visible then AdjustForm.UpdateDisplay;
//z GradientForm.DrawPreview;
// following needed ? // following needed ?
// cp.Zoom := Zoom; // cp.Zoom := Zoom;
// cp.center[0] := center[0]; // cp.center[0] := center[0];
@ -3302,11 +3299,9 @@ begin
StopThread; StopThread;
UpdateUndo; UpdateUndo;
maincp.cmap := Pal; maincp.cmap := Pal;
// gradientForm.UpdateGradient(Pal); AdjustForm.UpdateGradient(maincp.cmap);
{if AdjustForm.visible then} AdjustForm.UpdateGradient(maincp.cmap);
if EditForm.Visible then EditForm.UpdateDisplay; if EditForm.Visible then EditForm.UpdateDisplay;
// if AdjustForm.Visible then AdjustForm.UpdateDisplay;
if MutateForm.Visible then MutateForm.UpdateDisplay; if MutateForm.Visible then MutateForm.UpdateDisplay;
RedrawTimer.enabled := true; RedrawTimer.enabled := true;