Explorar o código

layout: reset SkipLayout/Rendering

mattias hai 11 meses
pai
achega
e44f1ec846

+ 1 - 3
demo/Combobox/DemoCombobox.pas

@@ -163,7 +163,6 @@ begin
     Menu.SetStyleAttr('display','')
   else
     Menu.SetStyleAttr('display','none');
-  writeln('TDemoCombobox.CaptionDivMouseDown ',Name,' "',Menu.Style,'"');
 end;
 
 procedure TDemoCombobox.SetCaption(const AValue: string);
@@ -202,13 +201,12 @@ begin
   CaptionIcon:=TImage.Create(Self);
   with CaptionIcon do begin
     Name:='CaptionIcon';
-    //Caption:=#$E2#$8C#$84; // Down Arrowhead
+    //Caption:=#$E2#$8C#$84; // Down Arrowhead, needs font that has it
     CSSClasses.Add('ComboboxCaptionIcon');
     Parent:=CaptionDiv;
   end;
   aStream:=TMemoryStream.Create;
   try
-    writeln('TDemoCombobox.Create ',ord(ArrowDownImage[1]),' ',length(ArrowDownImage));
     aStream.WriteBuffer(ArrowDownImage[1],length(ArrowDownImage));
     aStream.Position:=0;
     CaptionIcon.Image.LoadFromStream(aStream);

+ 1 - 1
demo/Combobox/MainUnit.pas

@@ -82,7 +82,7 @@ begin
     +'  text-shadow: 0 1 1 #333;'
     +'  color:#fff;'
     +'};');
-  Div1.Style:='';
+  Div1.Style:='display: none;';
 
   Combobox1:=TDemoCombobox.Create(Self);
   Combobox1.Name:='Combobox1';

+ 0 - 2
src/base/fresnel.dom.pas

@@ -879,7 +879,6 @@ type
     Container: TFresnelElement;
     SkipLayout: boolean; // e.g. element or ancestor display:none or visibility=collapse
     SkipRendering: boolean; // e.g. element or ancestor display:none or visibility<>visible
-    SubParent: boolean; // a node in between: has children but no Layouter, e.g. span
 
     // used values
     ZIndex: TFresnelLength; // position=static has 0, non static have z-index+0.5
@@ -7927,7 +7926,6 @@ begin
 
   //writeln('TFresnelElement.ComputeCSSValues ',GetPath,' ',Resolver<>nil);
   Resolver.Compute(Self,StyleElement,Rules,FCSSValues);
-
   // Note: var() and shorthands are already substituted
 
   // apply base keywords 'initial', 'inherit', 'unset', ...

+ 2 - 0
src/base/fresnel.layouter.pas

@@ -2050,6 +2050,8 @@ var
 begin
   // every node gets a layout node
   LNode:=CreateLayoutNode(El);
+  LNode.SkipLayout:=false;
+  LNode.SkipRendering:=false;
 
   // inherit flags
   if El.Parent<>nil then