paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-14 18:59:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Qt: fixed wrong implementation of TQtWidgetSet.RectVisible(), now it works few times faster, added TQtScrollBar.setFocusPolicy, TQtRegion.intersects().

Browse Source 
git-svn-id: trunk@25091 -
This commit is contained in:
zeljko 2010-05-01 10:59:43 +00:00
parent 4ec26a9c40
commit 9cfcda57d1
3 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lcl/interfaces/qt/qtobjects.pas
View File

@ -287,6 +287,8 @@ type
destructor Destroy; override;
function containsPoint(X,Y: Integer): Boolean;
function containsRect(R: TRect): Boolean;
function intersects(R: TRect): Boolean; overload;
function intersects(Rgn: QRegionH): Boolean; overload;
function GetRegionType: integer;
function getBoundingRect: TRect;
function numRects: Integer;
@ -1767,6 +1769,16 @@ begin
Result := QRegion_contains(Widget, PRect(@R));
end;
function TQtRegion.intersects(R: TRect): Boolean;
begin
Result := QRegion_intersects(Widget, PRect(@R));
end;
function TQtRegion.intersects(Rgn: QRegionH): Boolean;
begin
Result := QRegion_intersects(Widget, Rgn);
end;
function TQtRegion.GetRegionType: integer;
var
R: TRect;

9
lcl/interfaces/qt/qtwidgets.pas
View File

@ -328,6 +328,7 @@ type
protected
function CreateWidget(const AParams: TCreateParams):QWidgetH; override;
public
procedure setFocusPolicy(const APolicy: QtFocusPolicy); override;
function EventFilter(Sender: QObjectH; Event: QEventH): Boolean; cdecl; override;
procedure AttachEvents; override;
end;
@ -5618,6 +5619,14 @@ begin
FHasPaint := True;
end;
procedure TQtScrollBar.setFocusPolicy(const APolicy: QtFocusPolicy);
begin
if FOwnWidget and Assigned(LCLObject) and not LCLObject.TabStop then
inherited setFocusPolicy(QtNoFocus)
else
inherited setFocusPolicy(APolicy);
end;
function TQtScrollBar.EventFilter(Sender: QObjectH; Event: QEventH): Boolean;
cdecl;
begin

21
lcl/interfaces/qt/qtwinapi.inc
View File

@ -4037,28 +4037,17 @@ end;
function TQtWidgetSet.RectVisible(dc : hdc; const ARect: TRect) : Boolean;
var
w: QWidgetH;
Region: QRegionH;
QtDC: TQtDeviceContext;
begin
{$ifdef VerboseQtWinAPI}
writeln('[WinAPI RectVisible] ');
{$endif}
Result := False;
if not IsValidDC(DC) then Exit;
w := TQtDeviceContext(DC).Parent;
if w <> nil then
begin
if QWidget_isVisible(w) then
begin
Region := QRegion_create;
try
QWidget_visibleRegion(w, Region);
Result := QRegion_contains(Region, PRect(@ARect));
finally
QRegion_destroy(Region);
end;
end;
end;
QtDC := TQtDeviceContext(DC);
// as MSDN says only clipping region can play here
if QtDC.getClipping then
Result := QtDC.getClipRegion.containsRect(ARect);
end;
{------------------------------------------------------------------------------