added TCursorTimer.Redraw, TFresnelElement.Invalidate, InvalidateIfNotDrawing, ComputeCSSLayoutFinished

src/base/fresnel.cursortimer.pp

@@ -18,23 +18,26 @@ type
   TCursorTimer = class
   private
     FBlinkControl: IBlinkControl;
-    FBlink : Boolean;
+    FVisible: Boolean;
     FBlinkRate: Word;
     FTimer : TFPTimer;
     class var _Instance: TCursorTimer;
+    function GetVisible: boolean;
     procedure HandleBlink(Sender: TObject);
     procedure SetBlinkControl(const aValue: IBlinkControl);
     procedure SetBlinkRate(const aValue: Word);
   protected
     procedure DisableTimer;
     procedure EnableTimer;
-    Procedure Blink;
+    Procedure Blink; virtual;
   Public
     class constructor Init;
     class destructor Done;
-    constructor create; virtual;
+    constructor Create; virtual;
+    procedure Restart; virtual; // if blinking, restart timer and show cursor
     Property BlinkControl : IBlinkControl Read FBlinkControl Write SetBlinkControl;
-    Property BlinkRate : Word Read FBlinkRate Write SetBlinkRate;
+    Property BlinkRate : Word Read FBlinkRate Write SetBlinkRate; // interval in ms
+    Property Visible : boolean read GetVisible;
     Class property Instance : TCursorTimer Read _Instance;
   end;
 
@@ -52,8 +55,8 @@ end;
 procedure TCursorTimer.SetBlinkControl(const aValue: IBlinkControl);
 begin
   if FBlinkControl=aValue then Exit;
-  FBlink:=False;
-  Blink;
+  if FVisible then
+    Blink; // hide old cursor
   DisableTimer;
   FBlinkControl:=aValue;
   if assigned(FBlinkControl) then
@@ -65,6 +68,11 @@ begin
   Blink;
 end;
 
+function TCursorTimer.GetVisible: boolean;
+begin
+  Result:=(BlinkControl<>nil) and FVisible;
+end;
+
 procedure TCursorTimer.SetBlinkRate(const aValue: Word);
 begin
   if FBlinkRate=aValue then Exit;
@@ -79,7 +87,7 @@ end;
 procedure TCursorTimer.DisableTimer;
 begin
   if assigned(FTimer) then
-    FTimer.Enabled:=False
+    FTimer.Enabled:=False;
 end;
 
 procedure TCursorTimer.EnableTimer;
@@ -95,9 +103,9 @@ end;
 
 procedure TCursorTimer.Blink;
 begin
+  FVisible:=Not FVisible;
   if Assigned(FBlinkControl) then
-    FBlinkControl.Blink(FBlink);
-  FBlink:=Not FBlink;
+    FBlinkControl.Blink(FVisible);
 end;
 
 class constructor TCursorTimer.Init;
@@ -110,10 +118,22 @@ begin
   FreeAndNil(_instance);
 end;
 
-constructor TCursorTimer.create;
+constructor TCursorTimer.Create;
 begin
   FBlinkRate:=500;
 end;
 
+procedure TCursorTimer.Restart;
+begin
+  if FTimer=nil then exit;
+  if FTimer.Enabled then
+    begin
+    FTimer.Enabled:=false;
+    FTimer.Enabled:=true;
+    end;
+  if not FVisible then
+    Blink;
+end;
+
 end.
 

src/base/fresnel.dom.pas

@@ -1117,6 +1117,7 @@ type
     function GetRoot: TFresnelElement;
     function GetPath: string; virtual;
     function AcceptChildrenAtDesignTime: boolean; virtual;
+
     // Can this widget handle focus ?
     class function HandleFocus : Boolean; virtual;
     // Can this widget focus now ?
@@ -1125,7 +1126,10 @@ type
     function IsFocused : Boolean;
     // Attempt to set focus to this element. Return true if we got focus.
     function Focus : Boolean;
+
     procedure DomChanged; virtual;
+    procedure Invalidate; virtual; // queue a redraw
+    procedure InvalidateIfNotDrawing;
     property Parent: TFresnelElement read FParent write SetParent;
     property NodeCount: integer read GetNodeCount;
     property Nodes[Index: integer]: TFresnelElement read GetNodes; default;
@@ -1179,6 +1183,7 @@ type
     procedure ComputeInlineStyle; virtual; // parse inline style
     procedure ComputeCSSValues; virtual; // call resolver to collect CSS values and resolve shorthands
     procedure ComputeCSSAfterLayoutNode(Layouter: TFresnelLayouter); virtual; // called after layouter node, before layouter traverse children
+    procedure ComputeCSSLayoutFinished; virtual; // called after layout was finished
     function GetCSSString(AttrID: TCSSNumericalID; Compute: boolean; out Complete: boolean): string; virtual;
     function GetComputedLength(Attr: TFresnelCSSAttribute; UseNaNOnFail: boolean = false; NoChildren: boolean = false): TFresnelLength; virtual; overload;
     function GetComputedLength(AttrID: TCSSNumericalID; UseNaNOnFail: boolean = false; NoChildren: boolean = false): TFresnelLength; virtual; overload;
@@ -1430,6 +1435,7 @@ type
     procedure DomChanged; override;
     procedure Disconnecting; virtual;
     function AllocateFont(const Desc: TFresnelFontDesc): IFresnelFont; virtual;
+    function IsDrawing: boolean; virtual; abstract;
     function GetCSSString(AttrID: TCSSNumericalID; Compute: boolean; out Complete: boolean): string; override;
     class function CSSTypeID: TCSSNumericalID; override;
     class function CSSTypeName: TCSSString; override;
@@ -5796,6 +5802,19 @@ procedure TFresnelViewport.ApplyCSS;
       TraverseCSS(El.PseudoNodes[i]);
   end;
 
+  procedure TraverseLayoutFinished(El: TFresnelElement);
+  var
+    i: Integer;
+  begin
+    El.ComputeCSSLayoutFinished;
+    if fesPseudoElement in FStates then
+      exit;
+    for i:=0 to El.NodeCount-1 do
+      TraverseLayoutFinished(El.Nodes[i]);
+    for i:=0 to El.PseudoNodeCount-1 do
+      TraverseLayoutFinished(El.PseudoNodes[i]);
+  end;
+
 begin
   //writeln('TFresnelViewport.ApplyCSS ',Name,' Width=',FloatToCSSStr(Width),',Height=',FloatToCSSStr(Height));
   DomModified:=false;
@@ -5808,6 +5827,8 @@ begin
   TraverseCSS(Self);
   // layout
   Layouter.Apply;
+  // notify layout finished
+  TraverseLayoutFinished(Self);
 end;
 
 procedure TFresnelViewport.DomChanged;
@@ -7865,6 +7886,20 @@ begin
     FParent.DomChanged;
 end;
 
+procedure TFresnelElement.Invalidate;
+begin
+  if LayoutNode=nil then exit;
+  if LayoutNode.SkipRendering then exit;
+  if (Viewport<>nil) and (Viewport<>Self) then
+    Viewport.Invalidate;
+end;
+
+procedure TFresnelElement.InvalidateIfNotDrawing;
+begin
+  if (Viewport<>nil) and not Viewport.IsDrawing then
+    Invalidate;
+end;
+
 function TFresnelElement.HasParent: Boolean;
 begin
   Result:=Parent<>nil;
@@ -8497,6 +8532,11 @@ begin
   if Layouter<>nil then ;
 end;
 
+procedure TFresnelElement.ComputeCSSLayoutFinished;
+begin
+
+end;
+
 { TPseudoElement }
 
 constructor TPseudoElement.Create(AOwner: TComponent);

src/base/fresnel.edit.pp

@@ -1,4 +1,4 @@
-unit fresnel.edit;
+unit Fresnel.Edit;
 
 {$mode objfpc}{$H+}
 
@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, fpImage, fpCSSResParser, fpCSSTree, fresnel.CursorTimer,
-  Fresnel.TextLayouter, Fresnel.Classes, Fresnel.Dom, Fresnel.Keys, Fresnel.Controls,
+  Fresnel.Classes, Fresnel.Dom, Fresnel.Keys, Fresnel.Controls,
   FCL.events, Fresnel.Events, Utf8Utils;
 
 
@@ -365,6 +365,7 @@ procedure TEdit.HandleMouseUp(aEvent: TFresnelMouseEvent);
 begin
   // Nothing for the moment;
   // When popup menus are handled, then here we should show the popup if it was the right button.
+  if aEvent=nil then ;
 end;
 
 procedure TEdit.HandleMouseDown(aEvent: TFresnelMouseEvent);
@@ -431,7 +432,7 @@ end;
 procedure TEdit.Blink(aVisible: Boolean);
 begin
   FCursorVisible:=IsFocused and aVisible;
-  DomChanged;
+  InvalidateIfNotDrawing;
 end;
 
 class function TEdit.IsSpecialChar(aUnicodeChar : string) : boolean;
@@ -498,6 +499,7 @@ begin
   lPos  := 1;
   lCharNum := 0;
   FDrawOffset := 0;
+  lCharX := 0;
   while lPos <= Length(ltext) do
   begin
     lPrevPos := lPos;
@@ -639,7 +641,7 @@ var
   lLeftSideMargin,
   lRightSideMargin,
   lMaxWidth,
-  lCursorX: TFresnelLength;
+  lCursorX, NewCursorX: TFresnelLength;
   r: TFresnelRect;
 
 begin
@@ -657,7 +659,12 @@ begin
     if lCursorX <> 0 then
       FTextOffset:=FTextOffset-CursorWidth;
     end;
-  FCursorX := lCursorX - FTextOffset + lLeftSideMargin;
+  NewCursorX := lCursorX - FTextOffset + lLeftSideMargin;
+  if NewCursorX<>FCursorX then
+    begin
+    FCursorX := lCursorX - FTextOffset + lLeftSideMargin;
+    CursorTimer.Restart;
+    end;
 end;
 
 procedure TEdit.SetPlaceHolder(const aValue: TFresnelCaption);
@@ -780,14 +787,12 @@ var
   var
     lCur : TFresnelRect;
   begin
-    if not FCursorVisible then exit;
     lCur:=RenderedContentBox;
     lCur.Left:=lCur.Left+FCursorX; // CursorX has leftmargin
     lCur.Right:=lCur.Left+CursorWidth;
     aRenderer.FillRect(colBlack,lCur);
   end;
 
-
 begin
   // These will calculate FVisibleText etc.
   MaybeRecalcParams;

src/base/fresnel.forms.pas

@@ -34,7 +34,8 @@ type
   TFormState = (
     fsMinimized,
     fsMaximized,
-    fsLayoutQueued
+    fsLayoutQueued,
+    fsDrawing
     );
   TFormStates = set of TFormState;
 
@@ -99,8 +100,9 @@ type
     procedure DomChanged; override;
     procedure Hide; virtual;
     procedure Show; virtual;
-    procedure Invalidate; virtual;
+    procedure Invalidate; override;
     procedure InvalidateRect(const aRect: TFresnelRect); virtual;
+    function IsDrawing: boolean; override;
     property Designer: IFresnelFormDesigner read FDesigner write SetDesigner;
   public
     // widgetset
@@ -622,6 +624,11 @@ begin
     WSForm.InvalidateRect(aRect);
 end;
 
+function TFresnelCustomForm.IsDrawing: boolean;
+begin
+  Result:=fsDrawing in FFormStates;
+end;
+
 procedure TFresnelCustomForm.CreateWSForm;
 begin
   if WSFormAllocated then exit;
@@ -651,12 +658,19 @@ procedure TFresnelCustomForm.WSDraw;
 begin
   //FLLog(etDebug,'TFresnelCustomForm.WSDraw (%s)',[ToString]);
   //FLLog(etDebug,'TFresnelCustomForm.WSDraw Have renderer: %b',[Assigned(Renderer)]);
-  LayoutQueued:=false;
-  if DomModified then
-  begin
-    ApplyCSS;
+  if fsDrawing in FFormStates then
+    raise Exception.Create('20250228113612 already drawing');
+  Include(FFormStates,fsDrawing);
+  try
+    LayoutQueued:=false;
+    if DomModified then
+    begin
+      ApplyCSS;
+    end;
+    Renderer.Draw(Self);
+  finally
+    Exclude(FFormStates,fsDrawing);
   end;
-  Renderer.Draw(Self);
 end;
 
 procedure TFresnelCustomForm.WSResize(const NewFormBounds: TFresnelRect;
@@ -695,15 +709,14 @@ end;
 
 class function TFresnelApplicationIdleEvent.FresnelEventID: TEventID;
 begin
-  result:=evtIdle;
+  Result:=evtIdle;
 end;
 
-
 { TFresnelApplicationIdleEndEvent }
 
 class function TFresnelApplicationIdleEndEvent.FresnelEventID: TEventID;
 begin
-  result:=evtIdleEnd;
+  Result:=evtIdleEnd;
 end;
 
 { TFresnelApplicationActivateEvent }