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

Qt: fix mdiarea bad positioning and handling caused by recent changes in qt widgeset code.

Browse Source 
git-svn-id: trunk@15170 -
This commit is contained in:
zeljko 2008-05-16 13:37:58 +00:00
parent 9debfcb8b1
commit 06b546d269
1 changed files with 50 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3567,12 +3567,10 @@ begin
WriteLn('TQtMainWindow.CreateWidget Name: ', LCLObject.Name); WriteLn('TQtMainWindow.CreateWidget Name: ', LCLObject.Name);
{$endif} {$endif}
FHasPaint := True; FHasPaint := True;
IsMainForm := False; IsMainForm := False;
w := QApplication_activeWindow; w := QApplication_activeWindow;
if not Assigned(w) and not ((Application.MainForm <> nil) and (Application.MainForm.Visible)) if not Assigned(w) and not ((Application.MainForm <> nil) and (Application.MainForm.Visible))
and (TCustomForm(LCLObject).FormStyle <> fsSplash) then and (TCustomForm(LCLObject).FormStyle <> fsSplash) then
begin begin
@ -3592,8 +3590,9 @@ begin
if (Application.MainForm <> nil) and (Application.MainForm.FormStyle = fsMDIForm) if (Application.MainForm <> nil) and (Application.MainForm.FormStyle = fsMDIForm)
and not (csDesigning in LCLObject.ComponentState) then and not (csDesigning in LCLObject.ComponentState) then
begin begin
FCentralWidget := QMdiArea_create(Result); FCentralWidget := QWidget_create(Result);
MDIAreaHandle := QMdiAreaH(FCentralWidget); MDIAreaHandle := QMdiArea_create(Result);
QWidget_setParent(MdiAreaHandle, FCentralWidget);
end end
else else
begin begin
@ -3635,7 +3634,6 @@ begin
end; end;
// Main menu bar // Main menu bar
{$ifdef darwin} {$ifdef darwin}
MenuBar := TQtMenuBar.Create(nil); MenuBar := TQtMenuBar.Create(nil);
{$else} {$else}
@ -3643,6 +3641,7 @@ begin
{$endif} {$endif}
FCentralWidget := QWidget_create(Result); FCentralWidget := QWidget_create(Result);
LayoutWidget := QBoxLayout_create(QBoxLayoutTopToBottom, Result); LayoutWidget := QBoxLayout_create(QBoxLayoutTopToBottom, Result);
QBoxLayout_setSpacing(LayoutWidget, 0); QBoxLayout_setSpacing(LayoutWidget, 0);
@ -3807,8 +3806,13 @@ begin
end; end;
function TQtMainWindow.CWEventFilter(Sender: QObjectH; Event: QEventH): Boolean; cdecl; function TQtMainWindow.CWEventFilter(Sender: QObjectH; Event: QEventH): Boolean; cdecl;
var
R: TRect;
R2: TRect;
i: Integer;
begin begin
Result := False; Result := False;
if LCLObject <> nil then if LCLObject <> nil then
begin begin
case QEvent_type(Event) of case QEvent_type(Event) of
@ -3816,6 +3820,47 @@ begin
begin begin
LCLObject.InvalidateClientRectCache(true); LCLObject.InvalidateClientRectCache(true);
LCLObject.DoAdjustClientRectChange; LCLObject.DoAdjustClientRectChange;
{mdi area part begins}
if MdiAreaHandle <> nil then
begin
{first must get contents rect - all except main menu}
QWidget_contentsRect(FCentralWidget, @R);
{TODO: find better way to find out which controls are top,left,right & bottom aligned ...}
for i := 0 to LCLObject.ComponentCount - 1 do
begin
{find statusbars}
if LCLObject.Components[i] is TStatusBar then
begin
R2 := TWinControl(LCLObject.Components[i]).ClientRect;
case TWinControl(LCLObject.Components[i]).Align of
alLeft: R.Left := R.Left + (R2.Right - R2.Left);
alTop: R.Top := R.Top + (R2.Bottom - R2.Top);
alRight: R.Right := R.Right - (R2.Right - R2.Left);
alBottom: R.Bottom := R.Bottom - (R2.Bottom - R2.Top);
end;
end;
{find toolbars}
if LCLObject.Components[i] is TToolBar then
begin
R2 := TWinControl(LCLObject.Components[i]).ClientRect;
case TWinControl(LCLObject.Components[i]).Align of
alLeft: R.Left := R.Left + (R2.Right - R2.Left);
alTop: R.Top := R.Top + (R2.Bottom - R2.Top);
alRight: R.Right := R.Right - (R2.Right - R2.Left);
alBottom: R.Bottom := R.Bottom - (R2.Bottom - R2.Top);
end;
end;
end; {components loop}
QWidget_setGeometry(MDIAreaHandle, @R);
end;
{mdi area part end}
end; end;
end; end;
end; end;