paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-07 08:58:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed designer selecting hidden controls and postscriptprinter improvements from Olivier

Browse Source 
git-svn-id: trunk@6109 -
This commit is contained in:
mattias 2004-10-04 08:49:56 +00:00
parent 51e29b5767
commit 68955cf841
3 changed files with 1472 additions and 976 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
designer/designer.pp
View File

@ -235,8 +235,10 @@ type
function NonVisualComponentLeftTop(AComponent: TComponent): TPoint;
function NonVisualComponentAtPos(x,y: integer): TComponent;
function WinControlAtPos(x,y: integer; UseFormAsDefault: boolean): TWinControl;
function ControlAtPos(x,y: integer; UseFormAsDefault: boolean): TControl;
function WinControlAtPos(x,y: integer; UseFormAsDefault,
IgnoreHidden: boolean): TWinControl;
function ControlAtPos(x,y: integer; UseFormAsDefault,
IgnoreHidden: boolean): TControl;
function GetDesignedComponent(AComponent: TComponent): TComponent;
function GetComponentEditorForSelection: TBaseComponentEditor;
function GetShiftState: TShiftState; override;
@ -1047,7 +1049,7 @@ Begin
if NonVisualComp<>nil then MouseDownComponent:=NonVisualComp;
if MouseDownComponent=nil then begin
MouseDownComponent:=ControlAtPos(MouseDownPos.X,MouseDownPos.Y,true);
MouseDownComponent:=ControlAtPos(MouseDownPos.X,MouseDownPos.Y,true,true);
if MouseDownComponent=nil then exit;
end;
MouseDownSender:=Sender;
@ -1211,7 +1213,7 @@ var
if MouseDownComponent is TWinControl then
NewParentControl:=TWinControl(MouseDownComponent)
else
NewParentControl:=WinControlAtPos(MouseDownPos.X,MouseUpPos.X,true);
NewParentControl:=WinControlAtPos(MouseDownPos.X,MouseUpPos.X,true,true);
while (NewParentControl<>nil)
and ((not (csAcceptsControls in NewParentControl.ControlStyle))
or ((NewParentControl.Owner<>FLookupRoot)
@ -2215,8 +2217,8 @@ begin
Result:=nil;
end;
function TDesigner.WinControlAtPos(x, y: integer; UseFormAsDefault: boolean
): TWinControl;
function TDesigner.WinControlAtPos(x, y: integer; UseFormAsDefault,
IgnoreHidden: boolean): TWinControl;
var i: integer;
WinControlBounds: TRect;
begin
@ -2224,19 +2226,21 @@ begin
Result:=TWinControl(FLookupRoot.Components[i]);
if (Result is TWinControl) then begin
with Result do begin
WinControlBounds:=GetParentFormRelativeBounds(Result);
if (WinControlBounds.Left<=x) and (WinControlBounds.Top<=y)
and (WinControlBounds.Right>x)
and (WinControlBounds.Bottom>y) then
exit;
if (not IgnoreHidden) or ControlIsInDesignerVisible(Result) then begin
WinControlBounds:=GetParentFormRelativeBounds(Result);
if (WinControlBounds.Left<=x) and (WinControlBounds.Top<=y)
and (WinControlBounds.Right>x)
and (WinControlBounds.Bottom>y) then
exit;
end;
end;
end;
end;
Result:=Form;
end;
function TDesigner.ControlAtPos(x, y: integer; UseFormAsDefault: boolean
): TControl;
function TDesigner.ControlAtPos(x, y: integer; UseFormAsDefault,
IgnoreHidden: boolean): TControl;
var i: integer;
ControlBounds: TRect;
begin
@ -2244,11 +2248,13 @@ begin
Result:=TControl(FLookupRoot.Components[i]);
if (Result is TControl) then begin
with Result do begin
ControlBounds:=GetParentFormRelativeBounds(Result);
if (ControlBounds.Left<=x) and (ControlBounds.Top<=y)
and (ControlBounds.Right>x)
and (ControlBounds.Bottom>y) then
exit;
if (not IgnoreHidden) or ControlIsInDesignerVisible(Result) then begin
ControlBounds:=GetParentFormRelativeBounds(Result);
if (ControlBounds.Left<=x) and (ControlBounds.Top<=y)
and (ControlBounds.Right>x)
and (ControlBounds.Bottom>y) then
exit;
end;
end;
end;
end;

2404
lcl/postscriptprinter.pas
View File

File diff suppressed because it is too large Load Diff

2
lcl/printers.pas
View File

@ -128,7 +128,7 @@ type
fTitle : string; //Title of current document
fPrinting : Boolean; //Printing
fAborted : Boolean; //Abort process
fCapabilities: TPrinterCapabilities;
//fCapabilities: TPrinterCapabilities;
fPaperSize : TPaperSize;
function GetCanvas: TCanvas;