mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-20 17:40:40 +02:00
LCL: small cleanups
git-svn-id: trunk@14018 -
This commit is contained in:
parent
ae4f87e1ab
commit
79666bf74b
@ -617,9 +617,9 @@ end;
|
|||||||
procedure TCSSReader.EatWhiteSpace;
|
procedure TCSSReader.EatWhiteSpace;
|
||||||
var
|
var
|
||||||
Buf: char;
|
Buf: char;
|
||||||
comment: integer;
|
//comment: integer;
|
||||||
begin
|
begin
|
||||||
comment:=0;
|
//comment:=0;
|
||||||
while not EOF do
|
while not EOF do
|
||||||
begin
|
begin
|
||||||
Buf := char(FStream.ReadByte);
|
Buf := char(FStream.ReadByte);
|
||||||
|
@ -769,7 +769,7 @@ type
|
|||||||
{$IFDEF IP_LAZARUS}
|
{$IFDEF IP_LAZARUS}
|
||||||
FCSS: TCSSProps;
|
FCSS: TCSSProps;
|
||||||
FElementName: String;
|
FElementName: String;
|
||||||
FCSSPropsLoaded: boolean;
|
//FCSSPropsLoaded: boolean;
|
||||||
{$ENDIF}
|
{$ENDIF}
|
||||||
FStyle: string;
|
FStyle: string;
|
||||||
FClassId: string;
|
FClassId: string;
|
||||||
@ -14755,7 +14755,7 @@ function TIpHtmlNodeCore.GetFontSizeFromCSS(CurrentFontSize:Integer;
|
|||||||
|
|
||||||
var
|
var
|
||||||
P: double;
|
P: double;
|
||||||
ParentFSize: Integer;
|
//ParentFSize: Integer;
|
||||||
begin
|
begin
|
||||||
result := CurrentFontSize;
|
result := CurrentFontSize;
|
||||||
|
|
||||||
|
@ -1494,8 +1494,8 @@ begin
|
|||||||
end;
|
end;
|
||||||
{the item at L-2 will have the nearest smaller line number than the
|
{the item at L-2 will have the nearest smaller line number than the
|
||||||
one we want; start here and read through the stream forwards}
|
one we want; start here and read through the stream forwards}
|
||||||
CurLine := Longint(FLineIndex[L-2]);
|
CurLine := Longint(PtrInt(FLineIndex[L-2]));
|
||||||
Seek(Longint(FLineIndex[L-1]), soFromBeginning);
|
Seek(Longint(PtrInt(FLineIndex[L-1])), soFromBeginning);
|
||||||
while true do begin
|
while true do begin
|
||||||
atsGetLine(CurPos, EndPos, Len);
|
atsGetLine(CurPos, EndPos, Len);
|
||||||
inc(CurLine);
|
inc(CurLine);
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
{ Это - файл ресурсов, автоматически созданный lazarus }
|
|
||||||
|
|
||||||
LazarusResources.Add('TForm1','FORMDATA',[
|
LazarusResources.Add('TForm1','FORMDATA',[
|
||||||
'TPF0'#6'TForm1'#5'Form1'#4'Left'#3'"'#1#6'Height'#3','#1#3'Top'#3#175#0#5'Wi'
|
'TPF0'#6'TForm1'#5'Form1'#4'Left'#3'"'#1#6'Height'#3','#1#3'Top'#3#175#0#5'Wi'
|
||||||
+'dth'#3#144#1#18'HorzScrollBar.Page'#3#143#1#18'VertScrollBar.Page'#3'+'#1#13
|
+'dth'#3#144#1#18'HorzScrollBar.Page'#3#143#1#18'VertScrollBar.Page'#3'+'#1#13
|
||||||
|
@ -47,6 +47,8 @@ implementation
|
|||||||
|
|
||||||
procedure TForm1.Button1StartDrag(Sender: TObject; var DragObject: TDragObject);
|
procedure TForm1.Button1StartDrag(Sender: TObject; var DragObject: TDragObject);
|
||||||
begin
|
begin
|
||||||
|
// user started dragging on Button1
|
||||||
|
// create our own TDragControlObject which provides an image.
|
||||||
DragObject := TMyDragObject.Create(Sender as TControl);
|
DragObject := TMyDragObject.Create(Sender as TControl);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
@ -279,7 +279,7 @@ type
|
|||||||
FOldCursor: TCursor;
|
FOldCursor: TCursor;
|
||||||
FImageIndex: Integer;
|
FImageIndex: Integer;
|
||||||
FLastDragPos: TPoint;
|
FLastDragPos: TPoint;
|
||||||
FLockedWindow: HWND;
|
FLockedWindow: HWND;// window where drag started and locked via DragLock, invalid=NoLockedWindow=High(PtrInt)
|
||||||
procedure SetDragCursor(const AValue: TCursor);
|
procedure SetDragCursor(const AValue: TCursor);
|
||||||
protected
|
protected
|
||||||
procedure Initialize; override;
|
procedure Initialize; override;
|
||||||
|
@ -58,15 +58,15 @@ end;
|
|||||||
}
|
}
|
||||||
function TDragImageList.BeginDrag(Window: HWND; X, Y: Integer): Boolean;
|
function TDragImageList.BeginDrag(Window: HWND; X, Y: Integer): Boolean;
|
||||||
begin
|
begin
|
||||||
Result := TWsDragImageListClass(WidgetSetClass).BeginDrag(Self, Window,
|
Result := TWsDragImageListClass(WidgetSetClass).BeginDrag(Self, Window,
|
||||||
FImageIndex, FDragHotspot.X, FDragHotspot.Y);
|
FImageIndex, FDragHotspot.X, FDragHotspot.Y);
|
||||||
FDragging := Result;
|
FDragging := Result;
|
||||||
if Result then
|
if Result then
|
||||||
begin
|
begin
|
||||||
DragLock(Window, X, Y);
|
DragLock(Window, X, Y);
|
||||||
FOldCursor := Screen.Cursor;
|
FOldCursor := Screen.Cursor;
|
||||||
WidgetSet.SetCursor(Screen.Cursors[DragCursor])
|
WidgetSet.SetCursor(Screen.Cursors[DragCursor])
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
{
|
{
|
||||||
@ -91,7 +91,7 @@ begin
|
|||||||
XPos, YPos, True);
|
XPos, YPos, True);
|
||||||
if Result then
|
if Result then
|
||||||
FLastDragPos := Point(XPos, YPos);
|
FLastDragPos := Point(XPos, YPos);
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user