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

Qt6: fixed behaviour inside IDE

Browse Source
This commit is contained in:
zeljan1 2022-11-11 16:19:06 +01:00
parent 14c89302df
commit 646d41cfe5
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ide/componentpalette.pas
View File

@ -1014,7 +1014,7 @@ begin
Assert(Pages[i].PageName=UserOrder.ComponentPages[i], Assert(Pages[i].PageName=UserOrder.ComponentPages[i],
'UpdateNoteBookButtons: Page names do not match.'); 'UpdateNoteBookButtons: Page names do not match.');
Pg := TComponentPage(Pages[i]); Pg := TComponentPage(Pages[i]);
{$IF DEFINED(LCLQt) OR DEFINED(LCLQt5)} // Qt has some problems in moving existing tabs! {$IF DEFINED(LCLQt) OR DEFINED(LCLQt5) OR DEFINED(LCLQt6)} // Qt has some problems in moving existing tabs!
if Assigned(Pg.PageComponent) then begin if Assigned(Pg.PageComponent) then begin
Pg.PageComponent.Free; Pg.PageComponent.Free;
Pg.RemoveSheet; Pg.RemoveSheet;

4
ide/mainbar.pas
View File

@ -512,7 +512,7 @@ begin
end; end;
function TMainIDEBar.CalcNonClientHeight: Integer; function TMainIDEBar.CalcNonClientHeight: Integer;
{$IF DEFINED(LCLWin32) OR DEFINED(LCLGtk) OR DEFINED(LCLGtk2) OR DEFINED(LCLQt) OR DEFINED(LCLQt5)} {$IF DEFINED(LCLWin32) OR DEFINED(LCLGtk) OR DEFINED(LCLGtk2) OR DEFINED(LCLQt) OR DEFINED(LCLQt5) OR DEFINED(LCLQt6)}
var var
WindowRect, WindowClientRect: TRect; WindowRect, WindowClientRect: TRect;
{$ENDIF} {$ENDIF}
@ -533,7 +533,7 @@ begin
if not Showing then if not Showing then
Exit(0); Exit(0);
{$IF DEFINED(LCLWin32) OR DEFINED(LCLGtk) OR DEFINED(LCLGtk2) OR DEFINED(LCLQt) OR DEFINED(LCLQt5)} {$IF DEFINED(LCLWin32) OR DEFINED(LCLGtk) OR DEFINED(LCLGtk2) OR DEFINED(LCLQt) OR DEFINED(LCLQt5) OR DEFINED(LCLQt6)}
//Gtk2 + Win32 + Qt //Gtk2 + Win32 + Qt
//retrieve real main menu height because //retrieve real main menu height because
// - Win32: multi-line is possible (SM_CYMENU reflects only single line) // - Win32: multi-line is possible (SM_CYMENU reflects only single line)

2
ide/toolbarconfig.pas
View File

@ -304,7 +304,7 @@ begin
if (I<0) or (I>=lvToolbar.Items.Count-1) then Exit; if (I<0) or (I>=lvToolbar.Items.Count-1) then Exit;
Cmd := TIDEButtonCommand(lvToolbar.Items[I].Data); Cmd := TIDEButtonCommand(lvToolbar.Items[I].Data);
lvToolbar.Items.Delete(I); lvToolbar.Items.Delete(I);
{$IF DEFINED(LCLQt) or DEFINED(LCLQt5)} {$IF DEFINED(LCLQt) or DEFINED(LCLQt5) or DEFINED(LCLQt6)}
lvToolbar.ItemIndex := -1; // Try to make LCLQt behave. lvToolbar.ItemIndex := -1; // Try to make LCLQt behave.
lvToolbar.ItemIndex := I; lvToolbar.ItemIndex := I;
{$ENDIF} {$ENDIF}