|
@@ -344,7 +344,7 @@ begin
|
|
if AValue.Bottom<AValue.Top then
|
|
if AValue.Bottom<AValue.Top then
|
|
AValue.Bottom:=AValue.Top;
|
|
AValue.Bottom:=AValue.Top;
|
|
if FFormBounds=AValue then exit;
|
|
if FFormBounds=AValue then exit;
|
|
- FLLog(etDebug,['TCustomFresnelForm.SetFormBounds ',Self.ToString,' ',AValue.ToString]);
|
|
|
|
|
|
+ FLLog(etDebug,['TFresnelCustomForm.SetFormBounds ',Self.ToString,' ',AValue.ToString]);
|
|
FFormBounds:=AValue;
|
|
FFormBounds:=AValue;
|
|
if Designer<>nil then
|
|
if Designer<>nil then
|
|
Designer.SetDesignerFormBounds(Self,FFormBounds.GetRect)
|
|
Designer.SetDesignerFormBounds(Self,FFormBounds.GetRect)
|
|
@@ -390,7 +390,7 @@ end;
|
|
|
|
|
|
procedure TFresnelCustomForm.Loaded;
|
|
procedure TFresnelCustomForm.Loaded;
|
|
begin
|
|
begin
|
|
- FLLog(etDebug,['TCustomFresnelForm.Loaded ',Self.ToString]);
|
|
|
|
|
|
+ FLLog(etDebug,['TFresnelCustomForm.Loaded ',Self.ToString]);
|
|
inherited Loaded;
|
|
inherited Loaded;
|
|
if Visible then
|
|
if Visible then
|
|
Show
|
|
Show
|
|
@@ -422,13 +422,13 @@ end;
|
|
|
|
|
|
procedure TFresnelCustomForm.OnQueuedLayout(Data: Pointer);
|
|
procedure TFresnelCustomForm.OnQueuedLayout(Data: Pointer);
|
|
begin
|
|
begin
|
|
- //debugln(['TCustomFresnelForm.OnQueuedLayout ',DbgSName(Self),' ',LayoutQueued]);
|
|
|
|
|
|
+ //debugln(['TFresnelCustomForm.OnQueuedLayout ',DbgSName(Self),' ',LayoutQueued]);
|
|
if not LayoutQueued then exit;
|
|
if not LayoutQueued then exit;
|
|
try
|
|
try
|
|
ApplyCSS;
|
|
ApplyCSS;
|
|
//Layouter.WriteLayoutTree;
|
|
//Layouter.WriteLayoutTree;
|
|
Layouter.Apply(Self);
|
|
Layouter.Apply(Self);
|
|
- //debugln(['TCustomFresnelForm.OnQueuedLayout ',DbgSName(Self),' After Layouter.Apply, Invalidate...']);
|
|
|
|
|
|
+ //debugln(['TFresnelCustomForm.OnQueuedLayout ',DbgSName(Self),' After Layouter.Apply, Invalidate...']);
|
|
Invalidate;
|
|
Invalidate;
|
|
finally
|
|
finally
|
|
Exclude(FFormStates,fsLayoutQueued);
|
|
Exclude(FFormStates,fsLayoutQueued);
|
|
@@ -496,7 +496,7 @@ end;
|
|
|
|
|
|
procedure TFresnelCustomForm.Hide;
|
|
procedure TFresnelCustomForm.Hide;
|
|
begin
|
|
begin
|
|
- FLLog(etDebug,'TCustomFresnelForm.Hide '+Self.ToString);
|
|
|
|
|
|
+ FLLog(etDebug,'TFresnelCustomForm.Hide '+Self.ToString);
|
|
if (Designer<>nil)
|
|
if (Designer<>nil)
|
|
or ([csLoading,csDesigning]*ComponentState<>[])
|
|
or ([csLoading,csDesigning]*ComponentState<>[])
|
|
or not WSFormAllocated then
|
|
or not WSFormAllocated then
|
|
@@ -507,7 +507,7 @@ end;
|
|
|
|
|
|
procedure TFresnelCustomForm.Show;
|
|
procedure TFresnelCustomForm.Show;
|
|
begin
|
|
begin
|
|
- FLLog(etDebug,'TCustomFresnelForm.Show '+Self.ToString);
|
|
|
|
|
|
+ FLLog(etDebug,'TFresnelCustomForm.Show '+Self.ToString);
|
|
if (Designer<>nil) or ([csLoading,csDesigning,csDestroying]*ComponentState<>[]) then
|
|
if (Designer<>nil) or ([csLoading,csDesigning,csDestroying]*ComponentState<>[]) then
|
|
FVisible:=true
|
|
FVisible:=true
|
|
else
|
|
else
|
|
@@ -540,13 +540,13 @@ begin
|
|
if csDestroying in ComponentState then exit;
|
|
if csDestroying in ComponentState then exit;
|
|
|
|
|
|
// consistency checks
|
|
// consistency checks
|
|
- FLLog(etDebug,['TCustomFresnelForm.CreateWSForm ',Self.ToString]);
|
|
|
|
|
|
+ FLLog(etDebug,['TFresnelCustomForm.CreateWSForm ',Self.ToString]);
|
|
if Designer<>nil then
|
|
if Designer<>nil then
|
|
- raise Exception.Create('TCustomFresnelForm.CreateWSForm Designer<>nil');
|
|
|
|
|
|
+ raise Exception.Create('TFresnelCustomForm.CreateWSForm Designer<>nil');
|
|
if Parent = Self then
|
|
if Parent = Self then
|
|
- raise Exception.Create('TCustomFresnelForm.CreateWSForm Parent = Self')
|
|
|
|
|
|
+ raise Exception.Create('TFresnelCustomForm.CreateWSForm Parent = Self')
|
|
else if (Parent <> nil) then
|
|
else if (Parent <> nil) then
|
|
- raise Exception.Create('TCustomFresnelForm.CreateWSForm ToDo 20230915221832');
|
|
|
|
|
|
+ raise Exception.Create('TFresnelCustomForm.CreateWSForm ToDo 20230915221832');
|
|
|
|
|
|
// create
|
|
// create
|
|
WidgetSet.CreateWSForm(Self);
|
|
WidgetSet.CreateWSForm(Self);
|
|
@@ -561,8 +561,8 @@ end;
|
|
|
|
|
|
procedure TFresnelCustomForm.WSDraw;
|
|
procedure TFresnelCustomForm.WSDraw;
|
|
begin
|
|
begin
|
|
- FLLog(etDebug,'TCustomFresnelForm.WSDraw (%s)',[ToString]);
|
|
|
|
- FLLog(etDebug,'TCustomFresnelForm.WSDraw Have renderer: %b',[Assigned(Renderer)]);
|
|
|
|
|
|
+ FLLog(etDebug,'TFresnelCustomForm.WSDraw (%s)',[ToString]);
|
|
|
|
+ FLLog(etDebug,'TFresnelCustomForm.WSDraw Have renderer: %b',[Assigned(Renderer)]);
|
|
Renderer.Draw(Self);
|
|
Renderer.Draw(Self);
|
|
end;
|
|
end;
|
|
|
|
|
|
@@ -570,7 +570,7 @@ procedure TFresnelCustomForm.WSResize(const NewFormBounds: TFresnelRect;
|
|
NewWidth, NewHeight: TFresnelLength);
|
|
NewWidth, NewHeight: TFresnelLength);
|
|
begin
|
|
begin
|
|
if (FFormBounds=NewFormBounds) and (Width=NewWidth) and (Height=NewHeight) then exit;
|
|
if (FFormBounds=NewFormBounds) and (Width=NewWidth) and (Height=NewHeight) then exit;
|
|
- FLLog(etDebug,['TCustomFresnelForm.WSResize ',Self.ToString,' OldForm=',FFormBounds.ToString,' NewForm=',NewFormBounds.ToString,' OldWH=',FloatToStr(Width),',',FloatToStr(Height),' NewWH=',FloatToStr(NewWidth),',',FloatToStr(NewHeight)]);
|
|
|
|
|
|
+ FLLog(etDebug,['TFresnelCustomForm.WSResize ',Self.ToString,' OldForm=',FFormBounds.ToString,' NewForm=',NewFormBounds.ToString,' OldWH=',FloatToStr(Width),',',FloatToStr(Height),' NewWH=',FloatToStr(NewWidth),',',FloatToStr(NewHeight)]);
|
|
FFormBounds:=NewFormBounds;
|
|
FFormBounds:=NewFormBounds;
|
|
Width:=NewWidth;
|
|
Width:=NewWidth;
|
|
Height:=NewHeight;
|
|
Height:=NewHeight;
|
|
@@ -595,7 +595,7 @@ begin
|
|
end else begin
|
|
end else begin
|
|
WSData.ControlPos:=PageToContentPos(El,X,Y);
|
|
WSData.ControlPos:=PageToContentPos(El,X,Y);
|
|
end;
|
|
end;
|
|
- FLLog(etDebug,'TCustomFresnelForm.WSMouseXY El=%s PagePos=%s ControlPos=%s',[el.ToString, WSData.PagePos.ToString, WSData.ControlPos.ToString]);
|
|
|
|
|
|
+ FLLog(etDebug,'TFresnelCustomForm.WSMouseXY El=%s PagePos=%s ControlPos=%s',[el.ToString, WSData.PagePos.ToString, WSData.ControlPos.ToString]);
|
|
case MouseEventId of
|
|
case MouseEventId of
|
|
evtMouseDown:
|
|
evtMouseDown:
|
|
fMouseDownElement:=El;
|
|
fMouseDownElement:=El;
|