dom: SetStyleAttr: no need for resolver

demo/Combobox/DemoCombobox.pas

@@ -17,6 +17,7 @@ type
     FItemIndex: integer;
     FItems: TStrings;
     FOnChange: TNotifyEvent;
+    procedure CaptionDivMouseDown(Event: TAbstractEvent);
     function GetCaption: string;
     procedure SetCaption(const AValue: string);
     procedure SetItemIndex(const AValue: integer);
@@ -141,6 +142,14 @@ begin
     Result:='';
 end;
 
+procedure TDemoCombobox.CaptionDivMouseDown(Event: TAbstractEvent);
+begin
+  if Menu.GetStyleAttr('display')='none' then
+    Menu.SetStyleAttr('display','')
+  else
+    Menu.SetStyleAttr('display','none');
+end;
+
 procedure TDemoCombobox.SetCaption(const AValue: string);
 begin
   if CaptionLabel<>nil then
@@ -161,6 +170,7 @@ begin
     Name:='CaptionDiv';
     CSSClasses.Add('ComboboxCaption');
     Parent:=Self;
+    AddEventListener(evtMouseDown,@CaptionDivMouseDown);
   end;
 
   CaptionLabel:=TLabel.Create(Self);
@@ -182,6 +192,7 @@ begin
   with Menu do begin
     Name:='Menu';
     CSSClasses.Add('ComboboxMenu');
+    SetStyleAttr('display','none');
     Parent:=Self;
   end;
 

src/base/fcl-css/fpcssresparser.pas

@@ -563,11 +563,13 @@ type
     function GetCompString(const aValue: string; const ResValue: TCSSResCompValue): TCSSString; overload;
     // low level functions to parse attribute components
     function ReadComp(var aComp: TCSSResCompValue): boolean; // true if parsing attribute can continue
-    function ReadNumber(var aComp: TCSSResCompValue): boolean;
-    function ReadIdentifier(var aComp: TCSSResCompValue): boolean;
-    procedure SkipToEndOfAttribute(var p: PCSSChar);
-    function SkipString(var p: PCSSChar): boolean;
-    function SkipBrackets(var p: PCSSChar; Lvl: integer = 1): boolean;
+    procedure ReadWordID(var aComp: TCSSResCompValue);
+    class function ReadValue(var aComp: TCSSResCompValue): boolean; // true if parsing attribute can continue, not using CSSRegistry
+    class function ReadNumber(var aComp: TCSSResCompValue): boolean;
+    class function ReadIdentifier(var aComp: TCSSResCompValue): boolean;
+    class procedure SkipToEndOfAttribute(var p: PCSSChar);
+    class function SkipString(var p: PCSSChar): boolean;
+    class function SkipBrackets(var p: PCSSChar; Lvl: integer = 1): boolean;
     // registry
     function GetAttributeID(const aName: TCSSString; AutoCreate: boolean = false): TCSSNumericalID; virtual;
     function GetAttributeDesc(AttrID: TCSSNumericalID): TCSSAttributeDesc; virtual;
@@ -1630,6 +1632,34 @@ begin
 end;
 
 function TCSSBaseResolver.ReadComp(var aComp: TCSSResCompValue): boolean;
+begin
+  Result:=ReadValue(aComp);
+  ReadWordID(aComp);
+end;
+
+procedure TCSSBaseResolver.ReadWordID(var aComp: TCSSResCompValue);
+var
+  Identifier: TCSSString;
+begin
+  case aComp.Kind of
+  rvkFunctionUnknown:
+    begin
+      SetString(Identifier,aComp.StartP,aComp.EndP-aComp.StartP);
+      aComp.FunctionID:=CSSRegistry.IndexOfAttrFunction(Identifier);
+      if aComp.FunctionID>CSSIDNone then
+        aComp.Kind:=rvkFunction;
+    end;
+  rvkKeywordUnknown:
+    begin
+      SetString(Identifier,aComp.StartP,aComp.EndP-aComp.StartP);
+      aComp.KeywordID:=CSSRegistry.IndexOfKeyword(Identifier);
+      if aComp.KeywordID>CSSIDNone then
+        aComp.Kind:=rvkKeyword;
+    end;
+  end;
+end;
+
+class function TCSSBaseResolver.ReadValue(var aComp: TCSSResCompValue): boolean;
 var
   c: TCSSChar;
   p: PCSSChar;
@@ -1755,7 +1785,7 @@ begin
   aComp.EndP:=p;
 end;
 
-function TCSSBaseResolver.ReadNumber(var aComp: TCSSResCompValue): boolean;
+class function TCSSBaseResolver.ReadNumber(var aComp: TCSSResCompValue): boolean;
 var
   Negative, HasNumber: Boolean;
   Divisor: double;
@@ -1871,9 +1901,8 @@ begin
   //writeln('TCSSBaseResolver.ReadNumber "',p,'" Value=',FloatToCSSStr(aComp.Float),' U=',U,' Kind=',aComp.Kind,' Result=',Result);
 end;
 
-function TCSSBaseResolver.ReadIdentifier(var aComp: TCSSResCompValue): boolean;
+class function TCSSBaseResolver.ReadIdentifier(var aComp: TCSSResCompValue): boolean;
 var
-  Identifier: TCSSString;
   IsFunc: Boolean;
   p: PCSSChar;
 begin
@@ -1884,34 +1913,21 @@ begin
   repeat
     inc(p);
   until not (p^ in AlNumIden);
-  SetString(Identifier,aComp.StartP,p-aComp.StartP);
   IsFunc:=p^='(';
   if IsFunc then
   begin
     // function call
+    aComp.Kind:=rvkFunctionUnknown;
     aComp.BracketOpen:=p;
     if not SkipBrackets(p) then
     begin
       aComp.EndP:=p;
       exit;
     end;
-  end;
+  end else
+    aComp.Kind:=rvkKeywordUnknown;
   aComp.EndP:=p;
 
-  if IsFunc then
-  begin
-    aComp.FunctionID:=CSSRegistry.IndexOfAttrFunction(Identifier);
-    if aComp.FunctionID>CSSIDNone then
-      aComp.Kind:=rvkFunction
-    else
-      aComp.Kind:=rvkFunctionUnknown;
-  end else begin
-    aComp.KeywordID:=CSSRegistry.IndexOfKeyword(Identifier);
-    if aComp.KeywordID>CSSIDNone then
-      aComp.Kind:=rvkKeyword
-    else
-      aComp.Kind:=rvkKeywordUnknown;
-  end;
   Result:=true;
 end;
 
@@ -2007,7 +2023,7 @@ begin
     SetString(Result,Start,ResValue.EndP-Start);
 end;
 
-procedure TCSSBaseResolver.SkipToEndOfAttribute(var p: PCSSChar);
+class procedure TCSSBaseResolver.SkipToEndOfAttribute(var p: PCSSChar);
 begin
   repeat
     case p^ of
@@ -2018,7 +2034,7 @@ begin
   until false;
 end;
 
-function TCSSBaseResolver.SkipString(var p: PCSSChar): boolean;
+class function TCSSBaseResolver.SkipString(var p: PCSSChar): boolean;
 var
   Delim, c: TCSSChar;
 begin
@@ -2038,7 +2054,7 @@ begin
   until false;
 end;
 
-function TCSSBaseResolver.SkipBrackets(var p: PCSSChar; Lvl: integer): boolean;
+class function TCSSBaseResolver.SkipBrackets(var p: PCSSChar; Lvl: integer): boolean;
 const
   CSSMaxBracketLvl = 10;
 var

src/base/fresnel.dom.pas

@@ -6147,18 +6147,18 @@ begin
   aComp.EndP:=PChar(FStyle);
   repeat
     // read attribute name
-    if not Resolver.ReadComp(aComp) then exit;
-    if not (aComp.Kind in [rvkKeyword,rvkKeywordUnknown]) then exit;
+    if not TCSSResolver.ReadValue(aComp) then exit;
+    if aComp.Kind<>rvkKeywordUnknown then exit;
     l:=aComp.EndP-aComp.StartP;
     Found:=(l=length(AttrName)) and CompareMem(aComp.StartP,NameP,l);
     // read colon
-    if not Resolver.ReadComp(aComp) then exit;
+    if not TCSSResolver.ReadValue(aComp) then exit;
     if aComp.StartP^<>':' then exit;
     // read value
     StartP:=nil;
     EndP:=nil;
     repeat
-      if not Resolver.ReadComp(aComp)  then break;
+      if not TCSSResolver.ReadValue(aComp)  then break;
       if aComp.StartP^=';'  then break;
       if Found and (StartP=nil) then
         StartP:=aComp.StartP;
@@ -6197,7 +6197,7 @@ begin
   ValueEmpty:=true;
   repeat
     // read attribute name
-    if not Resolver.ReadComp(aComp) then
+    if not TCSSResolver.ReadValue(aComp) then
     begin
       if aComp.Kind=rvkInvalid then
         exit; // syntax error in aValue
@@ -6212,21 +6212,21 @@ begin
   aComp.EndP:=PChar(FStyle);
   repeat
     // read attribute name
-    if not Resolver.ReadComp(aComp) then break;
+    if not TCSSResolver.ReadValue(aComp) then break;
     if not (aComp.Kind in [rvkKeyword,rvkKeywordUnknown]) then
       exit; // syntax error in Style
     NameStartP:=aComp.StartP;
     l:=aComp.EndP-aComp.StartP;
     Found:=(l=length(AttrName)) and CompareMem(aComp.StartP,NameP,l);
     // read colon
-    if not Resolver.ReadComp(aComp) then
+    if not TCSSResolver.ReadValue(aComp) then
       exit; // syntax error in Style
     if aComp.StartP^<>':' then exit;
     // read value
     StartP:=nil;
     EndP:=nil;
     repeat
-      if not Resolver.ReadComp(aComp) then break;
+      if not TCSSResolver.ReadValue(aComp) then break;
       if (aComp.StartP^=';') then
       begin
         if Found then
@@ -6269,6 +6269,7 @@ begin
           exit(true); // no change
         FStyle:=LeftStr(FStyle,StartP-p)+aValue+copy(FStyle,EndP-p+1,length(FStyle));
       end;
+      Include(FStates,fesStyleChanged);
       DomChanged;
       exit(true);
     end;
@@ -6288,6 +6289,7 @@ begin
   end
   else
     FStyle:=AttrName+':'+aValue;
+  Include(FStates,fesStyleChanged);
   DomChanged;
   Result:=true;
 end;
@@ -7567,7 +7569,7 @@ begin
   if Value='' then
     exit;
   aComp.EndP:=PChar(Value);
-  if (not Resolver.ReadComp(aComp)) or (aComp.Kind<>rvkFloat) or IsNan(aComp.Float) then
+  if (not TCSSResolver.ReadValue(aComp)) or (aComp.Kind<>rvkFloat) or IsNan(aComp.Float) then
     exit;
   case aComp.FloatUnit of
   cuNone:
@@ -7609,6 +7611,7 @@ begin
     exit;
 
   aValue:=GetCSSString(CSSRegistry.FresnelAttrs[fcaDisplay].Index,false,Complete);
+
   aComp.EndP:=PChar(aValue);
   repeat
     if not Resolver.ReadComp(aComp) then break;

src/base/fresnel.layouter.pas

@@ -1638,10 +1638,11 @@ begin
 
   ChildEl:=ChildNode.Element;
 
-  { $IFDEF VerboseFresnelPlacing}
+  {$IFDEF VerboseFresnelPlacing}
   //if ChildEl.Name='Div1' then
-    writeln('TFLFlowLayouter.PlaceAbsoluteItem ',ChildEl.GetPath,' ',aMode,' Commit=',Commit,' Left=',FloatToCSSStr(ChildNode.Left),',Top=',FloatToCSSStr(ChildNode.Top),',Right=',FloatToCSSStr(ChildNode.Right),',Bottom=',FloatToCSSStr(ChildNode.Bottom),' Width=',FloatToCSSStr(ChildNode.Width),' Height=',FloatToCSSStr(ChildNode.Height),' Default=',FloatToCSSStr(DefaultPos.X),',',FloatToCSSStr(DefaultPos.Y));
-  { $ENDIF}
+    writeln('TFLLineLayouter.PlaceAbsoluteItem ',ChildEl.GetPath,' ',aMode,' Commit=',Commit,' Left=',FloatToCSSStr(ChildNode.Left),',Top=',FloatToCSSStr(ChildNode.Top),',Right=',FloatToCSSStr(ChildNode.Right),',Bottom=',FloatToCSSStr(ChildNode.Bottom),' Width=',FloatToCSSStr(ChildNode.Width),' Height=',FloatToCSSStr(ChildNode.Height),' Default=',FloatToCSSStr(DefaultPos.X),',',FloatToCSSStr(DefaultPos.Y));
+    writeln('TFLLineLayouter.PlaceAbsoluteItem ',CSSRegistry.Keywords[ChildEl.ComputedDisplayOutside],' ',CSSRegistry.Keywords[ChildEl.ComputedDisplayInside],' Style=',ChildEl.Style);
+  {$ENDIF}
   NewLeft:=ChildNode.Left;
   NewTop:=ChildNode.Top;
   NewRight:=ChildNode.Right;
@@ -1751,11 +1752,11 @@ begin
     r.Bottom:=R.Top+NewHeight;
     ChildEl.UsedContentBox:=r;
 
-    { $IFDEF VerboseFresnelPlacing}
-    writeln('TFLFlowLayouter.PlaceAbsoluteItem '+ChildEl.GetPath+' BorderBox='+ChildEl.UsedBorderBox.ToString);
+    {$IFDEF VerboseFresnelPlacing}
+    writeln('TFLLineLayouter.PlaceAbsoluteItem '+ChildEl.GetPath+' BorderBox='+ChildEl.UsedBorderBox.ToString);
     //if ChildEl.Name='Div1' then
-    //writeln('TFLFlowLayouter.PlaceAbsoluteItem ',ChildEl.GetPath,' ',aMode,' Commit Left=',FloatToCSSStr(ChildNode.Left),',Top=',FloatToCSSStr(ChildNode.Top),',Right=',FloatToCSSStr(ChildNode.Right),',Bottom=',FloatToCSSStr(ChildNode.Bottom),' Width=',FloatToCSSStr(ChildNode.Width),' Height=',FloatToCSSStr(ChildNode.Height));
-    { $ENDIF}
+    //writeln('TFLLineLayouter.PlaceAbsoluteItem ',ChildEl.GetPath,' ',aMode,' Commit Left=',FloatToCSSStr(ChildNode.Left),',Top=',FloatToCSSStr(ChildNode.Top),',Right=',FloatToCSSStr(ChildNode.Right),',Bottom=',FloatToCSSStr(ChildNode.Bottom),' Width=',FloatToCSSStr(ChildNode.Width),' Height=',FloatToCSSStr(ChildNode.Height));
+    {$ENDIF}
   end;
 end;