mattias 3 هفته پیش
والد
کامیت
b31e6e5aa4
2فایلهای تغییر یافته به همراه7 افزوده شده و 4 حذف شده
  1. 2 2
      src/base/fresnel.layouter.pas
  2. 5 2
      src/gtk3/fresnel.gtk3.pas

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

@@ -305,7 +305,7 @@ begin
       Size:=GetIntrinsicContentSize(flmMax,MaxWidth,MaxHeight);
       Node.ApplyScrollSize(Size);
       {$IFDEF VerboseFresnelScrolling}
-      writeln('TFLNodeLayouter.Apply "',Node.Element.Name,'" IntrinsicContentSize: Size=',FloatToCSSStr(Size.Width),'x',FloatToCSSStr(Size.Height),' ScrollSize=',FloatToCSSStr(Size.OverflowWidth),'x',FloatToCSSStr(Size.OverflowHeight),' NeedGutterHorz=',Size.NeedGutterHorizontal,' Vert=',Size.NeedGutterVertical,' Gutter:L=',FloatToCSSStr(Node.ScrollGutterLeft),',R=',FloatToCSSStr(Node.ScrollGutterRight),',T=',FloatToCSSStr(Node.ScrollGutterTop),',B=',FloatToCSSStr(Node.ScrollGutterBottom));
+      writeln('TFLNodeLayouter.Apply "',Node.Element.Name,'" IntrinsicContentSize: Size: ',Size.ToString,' Gutter:L=',FloatToCSSStr(Node.ScrollGutterLeft),',R=',FloatToCSSStr(Node.ScrollGutterRight),',T=',FloatToCSSStr(Node.ScrollGutterTop),',B=',FloatToCSSStr(Node.ScrollGutterBottom));
       {$ENDIF}
     end;
 
@@ -328,7 +328,7 @@ begin
     {$ENDIF}
     Size:=ComputeLayoutContent(flmMax,AvailWidth,AvailHeight,true);
     {$IFDEF VerboseFresnelScrolling}
-    writeln('TFLNodeLayouter.Apply "',Node.Element.Name,'" Size: ',FloatToCSSStr(Size.Width),'x',FloatToCSSStr(Size.Height),' Scroll: ',FloatToCSSStr(Size.OverflowWidth),'x',FloatToCSSStr(Size.OverflowHeight));
+    writeln('TFLNodeLayouter.Apply "',Node.Element.Name,'" Size: ',Size.ToString);
     {$ENDIF}
     if IsNan(Node.Width) then
     begin

+ 5 - 2
src/gtk3/fresnel.gtk3.pas

@@ -1268,6 +1268,7 @@ begin
   if lData.Clipboard<>clipboard then
     exit;
   gtk_selection_data_set(selection_data,gdk_atom_intern(PAnsiChar(lData.Target),False),8,PByte(lData.Data),Length(lData.Data));
+  if info=0 then ;
 end;
 
 procedure ClearClipboardData(clipboard: PGtkClipboard; user_data_or_owner: gpointer); cdecl;
@@ -1292,8 +1293,10 @@ var
 
 begin
   lTargetName:=MimeTypeToAtomName(aMimeType);
-  lAtom:=gdk_atom_intern(pansichar(lTargetName),false);
-  lTargets:=gtk_target_entry_new(Pansichar(lTargetName),0,0);
+  lAtom:=gdk_atom_intern(PAnsiChar(lTargetName),false);
+  if lAtom=nil then
+    ; // raise exception?
+  lTargets:=gtk_target_entry_new(PAnsiChar(lTargetName),0,0);
   lData:=TClipboardData.Create(fClipboard,aContents,lTargetName);
   gtk_clipboard_set_with_data(fclipboard,lTargets,1,@GetClipboardData,@ClearClipboardData,lData);
 end;