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

Qt: removed QtSizeFix define, now it's default.

Browse Source 
git-svn-id: trunk@25065 -
This commit is contained in:
zeljko 2010-04-29 13:15:32 +00:00
parent 06f583ae49
commit 6c92c3ba1d
1 changed files with 6 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -707,9 +707,7 @@ type
private private
FCurrentChangedHook: QTabWidget_hookH; FCurrentChangedHook: QTabWidget_hookH;
FCloseRequestedHook: QTabWidget_hookH; FCloseRequestedHook: QTabWidget_hookH;
{$IFDEF QTSizeFix}
FStackedWidgetHook: QObject_hookH; FStackedWidgetHook: QObject_hookH;
{$ENDIF}
FTabBar: TQtTabBar; FTabBar: TQtTabBar;
FStackWidget: QWidgetH; FStackWidget: QWidgetH;
function getShowTabs: Boolean; function getShowTabs: Boolean;
@ -4757,11 +4755,6 @@ begin
case QEvent_type(Event) of case QEvent_type(Event) of
QEventResize: QEventResize:
begin begin
{$IFNDEF QTSizeFix}
LCLObject.InvalidateClientRectCache(true);
LCLObject.DoAdjustClientRectChange;
{$ENDIF}
{mdi area part begins} {mdi area part begins}
if MdiAreaHandle <> nil then if MdiAreaHandle <> nil then
begin begin
@ -5470,7 +5463,6 @@ begin
if not InUpdate or (getVisible and ((p1=getMin) or b)) then if not InUpdate or (getVisible and ((p1=getMin) or b)) then
begin begin
DeliverMessage(LMScroll); DeliverMessage(LMScroll);
{$IFDEF QTSizeFix}
if b and (FChildOfComplexWidget = ccwAbstractScrollArea) then if b and (FChildOfComplexWidget = ccwAbstractScrollArea) then
begin begin
LCLObject.DoAdjustClientRectChange; LCLObject.DoAdjustClientRectChange;
@ -5478,7 +5470,6 @@ begin
QAbstractSlider_triggerAction(QAbstractSliderH(Widget), QAbstractSlider_triggerAction(QAbstractSliderH(Widget),
QAbstractSliderSliderToMaximum); QAbstractSliderSliderToMaximum);
end; end;
{$ENDIF}
end; end;
end; end;
@ -6489,21 +6480,21 @@ begin
FCloseRequestedHook := QTabWidget_hook_create(Widget); FCloseRequestedHook := QTabWidget_hook_create(Widget);
QTabWidget_hook_hook_tabCloseRequested(FCloseRequestedHook, @SignalCloseRequested); QTabWidget_hook_hook_tabCloseRequested(FCloseRequestedHook, @SignalCloseRequested);
{$IFDEF QTSizeFix}
FStackedWidgetHook := QObject_hook_create(StackWidget); FStackedWidgetHook := QObject_hook_create(StackWidget);
QObject_hook_hook_events(FStackedWidgetHook, @EventFilter); QObject_hook_hook_events(FStackedWidgetHook, @EventFilter);
{$ENDIF}
end; end;
procedure TQtTabWidget.DetachEvents; procedure TQtTabWidget.DetachEvents;
begin begin
{$IFDEF QTSizeFix}
if FStackedWidgetHook <> nil then if FStackedWidgetHook <> nil then
begin begin
QObject_hook_destroy(FStackedWidgetHook); QObject_hook_destroy(FStackedWidgetHook);
FStackedWidgetHook := nil; FStackedWidgetHook := nil;
end; end;
{$ENDIF}
QTabWidget_hook_destroy(FCurrentChangedHook); QTabWidget_hook_destroy(FCurrentChangedHook);
QTabWidget_hook_destroy(FCloseRequestedHook); QTabWidget_hook_destroy(FCloseRequestedHook);
inherited DetachEvents; inherited DetachEvents;
@ -6517,7 +6508,7 @@ begin
QEvent_accept(Event); QEvent_accept(Event);
if LCLObject = nil then if LCLObject = nil then
exit; exit;
{$IFDEF QTSizeFix}
if (Sender = FStackWidget) then if (Sender = FStackWidget) then
begin begin
case QEvent_type(Event) of case QEvent_type(Event) of
@ -6529,7 +6520,7 @@ begin
end; end;
exit; exit;
end; end;
{$ENDIF}
BeginEventProcessing; BeginEventProcessing;
case QEvent_type(Event) of case QEvent_type(Event) of
QEventKeyPress, QEventKeyPress,
@ -10176,13 +10167,8 @@ begin
QEventResize: QEventResize:
begin begin
Result := False; Result := False;
{$IFDEF QTSizeFix}
// immediate update clientRect ! // immediate update clientRect !
LCLObject.DoAdjustClientRectChange; LCLObject.DoAdjustClientRectChange;
{$ELSE}
LCLObject.InvalidateClientRectCache(true);
LCLObject.DoAdjustClientRectChange;
{$ENDIF}
end; end;
QEventLayoutRequest: QEventLayoutRequest:
begin begin
@ -10340,13 +10326,6 @@ begin
end; end;
end; end;
if ClassType = TQtCustomControl then
begin
{$IFNDEF QtSizeFix}
LCLObject.InvalidateClientRectCache(true);
LCLObject.DoAdjustClientRectChange;
{$ENDIF}
end;
end; end;
procedure TQtAbstractScrollArea.DestroyNotify(AWidget: TQtWidget); procedure TQtAbstractScrollArea.DestroyNotify(AWidget: TQtWidget);
@ -10601,20 +10580,7 @@ end;
function TQtCustomControl.getClientBounds: TRect; function TQtCustomControl.getClientBounds: TRect;
begin begin
{$IFDEF QTSizeFix}
QWidget_rect(viewportWidget, @Result); QWidget_rect(viewportWidget, @Result);
{$ELSE}
QWidget_contentsRect(Widget, @Result);
if not FFrameOnlyAroundContents then
begin
if (verticalScrollBar.getVisibleTo(Widget)) then
dec(Result.Right, verticalScrollBar.getWidth);
if (horizontalScrollBar.getVisibleTo(Widget)) then
dec(Result.Bottom, horizontalScrollBar.getHeight);
end;
{$ENDIF}
end; end;
procedure TQtCustomControl.grabMouse; procedure TQtCustomControl.grabMouse;
@ -11065,14 +11031,9 @@ end;
function TQtPage.EventFilter(Sender: QObjectH; Event: QEventH): Boolean; cdecl; function TQtPage.EventFilter(Sender: QObjectH; Event: QEventH): Boolean; cdecl;
begin begin
{$IFDEF QTSizeFix}
if (QEvent_type(Event) = QEventResize) and if (QEvent_type(Event) = QEventResize) and
LCLObject.Parent.ClientRectNeedsInterfaceUpdate then LCLObject.Parent.ClientRectNeedsInterfaceUpdate then
LCLObject.Parent.InvalidateClientRectCache(False); LCLObject.Parent.InvalidateClientRectCache(False);
{$ELSE}
if (QEvent_type(Event) = QEventResize) and not InUpdate then
LCLObject.Parent.InvalidateClientRectCache(False);
{$ENDIF}
Result:=inherited EventFilter(Sender, Event); Result:=inherited EventFilter(Sender, Event);
end; end;