فهرست منبع

fixed rendering client offset

mattias 4 ماه پیش
والد
کامیت
60eeacae25
2فایلهای تغییر یافته به همراه8 افزوده شده و 8 حذف شده
  1. 6 6
      demo/Button/MainUnit.pas
  2. 2 2
      src/base/fresnel.renderer.pas

+ 6 - 6
demo/Button/MainUnit.pas

@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, Fresnel.Forms, Fresnel.Controls, Fresnel.Events,
-  FCL.Events;
+  FCL.Events, Fresnel.Classes;
 
 type
 
@@ -43,27 +43,27 @@ end;
 
 procedure TMainForm.Div1MouseDown(Event: TFresnelMouseEvent);
 begin
-  writeln('TMainForm.Div1MouseDown ',Event.ClientX,',',Event.ClientY);
+  writeln('TMainForm.Div1MouseDown ',FloatToCSSStr(Event.ClientX),',',FloatToCSSStr(Event.ClientY));
 end;
 
 procedure TMainForm.Div1MouseMove(Event: TFresnelMouseEvent);
 begin
-  writeln('TMainForm.Div1MouseMove ',Event.ClientX,',',Event.ClientY);
+  writeln('TMainForm.Div1MouseMove ',FloatToCSSStr(Event.ClientX),',',FloatToCSSStr(Event.ClientY));
 end;
 
 procedure TMainForm.Label1MouseDown(Event: TFresnelMouseEvent);
 begin
-  writeln('TMainForm.Label1MouseDown ',Event.ClientX,',',Event.ClientY);
+  writeln('TMainForm.Label1MouseDown ',FloatToCSSStr(Event.ClientX),',',FloatToCSSStr(Event.ClientY));
 end;
 
 procedure TMainForm.Label1MouseMove(Event: TFresnelMouseEvent);
 begin
-  writeln('TMainForm.Label1MouseMove ',Event.ClientX,',',Event.ClientY);
+  writeln('TMainForm.Label1MouseMove ',FloatToCSSStr(Event.ClientX),',',FloatToCSSStr(Event.ClientY));
 end;
 
 procedure TMainForm.Label1MouseUp(Event: TFresnelMouseEvent);
 begin
-  writeln('TMainForm.Label1MouseUp ',Event.ClientX,',',Event.ClientY);
+  writeln('TMainForm.Label1MouseUp ',FloatToCSSStr(Event.ClientX),',',FloatToCSSStr(Event.ClientY));
 end;
 
 procedure TMainForm.MainFormCreate(Sender: TObject);

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

@@ -557,7 +557,7 @@ begin
   if aPosition>1 then aPosition:=1;
   aPosition:=aPosition*Size;
 
-  writeln('TRendererScrollBar.GetHit Horz=',Horizontal,' aPosition=',FloatToCSSStr(aPosition),' Position=',FloatToCSSStr(Position),' Size=',FloatToCSSStr(Size),' LT=',FloatToCSSStr(LT),' RB=',FloatToCSSStr(RB),' Y=',FloatToCSSStr(Y));
+  //writeln('TRendererScrollBar.GetHit Horz=',Horizontal,' aPosition=',FloatToCSSStr(aPosition),' Position=',FloatToCSSStr(Position),' Size=',FloatToCSSStr(Size),' LT=',FloatToCSSStr(LT),' RB=',FloatToCSSStr(RB),' Y=',FloatToCSSStr(Y));
 
   if aPosition<Position then
     Result:=THit.hTrackLT
@@ -918,7 +918,7 @@ begin
 
   OldOrigin:=Origin;
   NewOrigin.X:=OldOrigin.X+El.UsedClientBox.Left-El.ScrollLeft;
-  NewOrigin.Y:=OldOrigin.Y+El.UsedClientBox.Left-El.ScrollTop;
+  NewOrigin.Y:=OldOrigin.Y+El.UsedClientBox.Top-El.ScrollTop;
   Origin:=NewOrigin;
   //writeln('TFresnelRenderer.DrawChildren ',El.GetPath,' Old=',OldOrigin.ToString,' Origin=',Origin.ToString);
   for i:=0 to LNode.NodeCount-1 do