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

Qt:

Browse Source 
- more checks while setting / getting scroll info
- another trial to speedup TCustomControl

git-svn-id: trunk@12171 -
This commit is contained in:
paul 2007-09-25 01:57:10 +00:00
parent 3769cc722c
commit a5a7bd7796
2 changed files with 52 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,7 +125,7 @@ type
procedure SlotMouseMove(Event: QEventH); cdecl; procedure SlotMouseMove(Event: QEventH); cdecl;
procedure SlotMouseWheel(Sender: QObjectH; Event: QEventH); cdecl; procedure SlotMouseWheel(Sender: QObjectH; Event: QEventH); cdecl;
procedure SlotMove(Event: QEventH); cdecl; procedure SlotMove(Event: QEventH); cdecl;
procedure SlotPaint(Event: QEventH); cdecl; procedure SlotPaint(Sender: QObjectH; Event: QEventH); cdecl;
procedure SlotResize; cdecl; procedure SlotResize; cdecl;
procedure SlotContextMenu; cdecl; procedure SlotContextMenu; cdecl;
procedure SlotLCLMessage(Sender: QObjectH; Event: QEventH); cdecl; procedure SlotLCLMessage(Sender: QObjectH; Event: QEventH); cdecl;
@ -133,8 +133,8 @@ type
procedure Activate; procedure Activate;
procedure BringToFront; procedure BringToFront;
procedure OffsetMousePos(APoint: PQtPoint); virtual; procedure OffsetMousePos(APoint: PQtPoint); virtual;
procedure Update(ARect: PRect = nil); procedure Update(ARect: PRect = nil); virtual;
procedure Repaint(ARect: PRect = nil); procedure Repaint(ARect: PRect = nil); virtual;
procedure setWindowTitle(Str: PWideString); procedure setWindowTitle(Str: PWideString);
procedure WindowTitle(Str: PWideString); procedure WindowTitle(Str: PWideString);
procedure Hide; procedure Hide;
@ -286,6 +286,8 @@ type
procedure setVerticalScrollBar(AScrollBar: TQtScrollBar); procedure setVerticalScrollBar(AScrollBar: TQtScrollBar);
procedure setVisible(visible: Boolean); override; procedure setVisible(visible: Boolean); override;
procedure viewportNeeded; procedure viewportNeeded;
procedure Update(ARect: PRect = nil); override;
procedure Repaint(ARect: PRect = nil); override;
end; end;
{ TQtArrow } { TQtArrow }
@ -1359,7 +1361,7 @@ begin
end; end;
QEventMove: SlotMove(Event); QEventMove: SlotMove(Event);
QEventResize: SlotResize; QEventResize: SlotResize;
QEventPaint: SlotPaint(Event); QEventPaint: SlotPaint(Sender, Event);
QEventContextMenu: SlotContextMenu; QEventContextMenu: SlotContextMenu;
QEventLCLMessage: QEventLCLMessage:
begin begin
@ -1943,7 +1945,7 @@ end;
Sends a LM_PAINT message to the LCL. This is for windowed controls only Sends a LM_PAINT message to the LCL. This is for windowed controls only
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
procedure TQtWidget.SlotPaint(Event: QEventH); cdecl; procedure TQtWidget.SlotPaint(Sender: QObjectH; Event: QEventH); cdecl;
var var
Msg: TLMPaint; Msg: TLMPaint;
AStruct: PPaintStruct; AStruct: PPaintStruct;
@ -5885,6 +5887,7 @@ constructor TQtMenu.Create(const AMenuItem: TMenuItem);
var var
AParams: TCreateParams; AParams: TCreateParams;
begin begin
FillChar(AParams, SizeOf(AParams), #0);
FMenuItem := AMenuItem; FMenuItem := AMenuItem;
inherited Create(nil, AParams); inherited Create(nil, AParams);
end; end;
@ -6236,7 +6239,7 @@ begin
{$ifdef VerboseQt} {$ifdef VerboseQt}
WriteLn('TQtAbstractScrollArea.Create'); WriteLn('TQtAbstractScrollArea.Create');
{$endif} {$endif}
FViewPortWidget := niL; FViewPortWidget := nil;
Result := QScrollArea_create(); Result := QScrollArea_create();
QWidget_setAttribute(Result, QtWA_NoMousePropagation); QWidget_setAttribute(Result, QtWA_NoMousePropagation);
end; end;
@ -6448,6 +6451,28 @@ begin
QAbstractScrollArea_setViewport(QAbstractScrollAreaH(Widget), FViewPortWidget.Widget); QAbstractScrollArea_setViewport(QAbstractScrollAreaH(Widget), FViewPortWidget.Widget);
end; end;
procedure TQtAbstractScrollArea.Update(ARect: PRect);
begin
if ARect <> nil then
begin
OffsetRect(ARect^, -1, -1);
QWidget_update(viewport.widget, ARect);
end
else
QWidget_update(viewport.widget);
end;
procedure TQtAbstractScrollArea.Repaint(ARect: PRect);
begin
if ARect <> nil then
begin
OffsetRect(ARect^, -1, -1);
QWidget_repaint(viewport.widget, ARect);
end
else
QWidget_repaint(viewport.widget);
end;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------
Function: TQtAbstractScrollArea.setScrollStyle Function: TQtAbstractScrollArea.setScrollStyle
Params: None Params: None

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

@ -2396,27 +2396,29 @@ begin
if not TQtWidget(Handle).LCLObject.InheritsFrom(TCustomScrollBar) then if not TQtWidget(Handle).LCLObject.InheritsFrom(TCustomScrollBar) then
begin begin
if (TQtWidget(Handle) is TQtAbstractScrollArea) then
begin
case BarFlag of
SB_HORZ: QtScrollBar := TQtAbstractScrollArea(Handle).horizontalScrollBar;
SB_VERT: QtScrollBar := TQtAbstractScrollArea(Handle).verticalScrollBar;
end;
case BarFlag of if QtScrollBar = nil then exit;
SB_HORZ: QtScrollBar := TQtAbstractScrollArea(Handle).horizontalScrollBar;
SB_VERT: QtScrollBar := TQtAbstractScrollArea(Handle).verticalScrollBar;
end;
if QtScrollBar = nil then exit; ScrollInfo.nTrackPos := 0;
ScrollInfo.nTrackPos := 0; ScrollInfo.nMax := QtScrollBar.getMax;
ScrollInfo.nMin := QtScrollBar.getMin;
ScrollInfo.nMax := QtScrollBar.getMax; ScrollInfo.nPage := QtScrollBar.getPageStep;
ScrollInfo.nMin := QtScrollBar.getMin; ScrollInfo.nPos := QtScrollBar.getValue;
ScrollInfo.nPage := QtScrollBar.getPageStep; ScrollInfo.fMask := SIF_ALL;
ScrollInfo.nPos := QtScrollBar.getValue; ScrollInfo.cbSize := SizeOf(ScrollInfo);
ScrollInfo.fMask := SIF_ALL; Result := True;
ScrollInfo.cbSize := SizeOf(ScrollInfo); end else
Result := False;
Result := True;
end end
else else
FScrollBar := TScrollBar(TQtWidget(Handle).LCLObject); FScrollBar := TScrollBar(TQtWidget(Handle).LCLObject);
if Assigned(FScrollBar) then if Assigned(FScrollBar) then
begin begin
@ -3224,8 +3226,7 @@ begin
begin begin
R := TQtWidget(aHandle).getClientBounds; R := TQtWidget(aHandle).getClientBounds;
OffsetRect(Rect^, R.Left, R.Top); OffsetRect(Rect^, R.Left, R.Top);
if bErase and (TQtWidget(aHandle).Context <> 0) then // no need to handle bErase. Qt automatically erase rect on paint event according to docs
TQtDeviceContext(TQtWidget(aHandle).Context).eraseRect(Rect);
TQtWidget(aHandle).Update(Rect); TQtWidget(aHandle).Update(Rect);
end else end else
TQtWidget(aHandle).Update; TQtWidget(aHandle).Update;
@ -4188,7 +4189,7 @@ begin
Scrollbar.Width := R.Right - ScrollBar.Height; Scrollbar.Width := R.Right - ScrollBar.Height;
ScrollBar.Top := R.Bottom - ScrollBar.Height; ScrollBar.Top := R.Bottom - ScrollBar.Height;
if not TQtWidget(Handle).LCLObject.InheritsFrom(TCustomForm) then if (TQtWidget(Handle) is TQtAbstractScrollArea) then
begin begin
ScrollBar.Parent := TQtAbstractScrollArea(Handle).LCLObject; ScrollBar.Parent := TQtAbstractScrollArea(Handle).LCLObject;
TQtAbstractScrollArea(Handle).sethorizontalScrollBar(TQtScrollBar(ScrollBar.Handle)); TQtAbstractScrollArea(Handle).sethorizontalScrollBar(TQtScrollBar(ScrollBar.Handle));
@ -4229,7 +4230,7 @@ begin
ScrollBar.Top := 0; ScrollBar.Top := 0;
{TODO: Check why BorderWidth is 0 when BorderStyle is eg. bsSingle ?!? } {TODO: Check why BorderWidth is 0 when BorderStyle is eg. bsSingle ?!? }
ScrollBar.Left := R.Right - ScrollBar.Width; ScrollBar.Left := R.Right - ScrollBar.Width;
if not TQtWidget(Handle).LCLObject.InheritsFrom(TCustomForm) then if (TQtWidget(Handle) is TQtAbstractScrollArea) then
begin begin
ScrollBar.Parent := TQtAbstractScrollArea(Handle).LCLObject; ScrollBar.Parent := TQtAbstractScrollArea(Handle).LCLObject;
TQtAbstractScrollArea(Handle).setVerticalScrollBar(TQtScrollBar(ScrollBar.Handle)); TQtAbstractScrollArea(Handle).setVerticalScrollBar(TQtScrollBar(ScrollBar.Handle));