From 75513fc0bd7b987a70c54637f87a9e4df4c8d4b2 Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Thu, 19 Feb 2015 03:18:18 +0100 Subject: [PATCH] added support for non-dockable widget in mainForm --- src/ce_main.pas | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/ce_main.pas b/src/ce_main.pas index 0912558b..4d379f27 100644 --- a/src/ce_main.pas +++ b/src/ce_main.pas @@ -469,6 +469,7 @@ begin for i := 0 to fWidgList.Count-1 do begin + if not fWidgList.widget[i].isDockable then continue; DockMaster.MakeDockable(fWidgList.widget[i], not fileExists(getCoeditDocPath + 'docking.xml')); DockMaster.GetAnchorSite(fWidgList.widget[i]).Header.HeaderPosition := adlhpTop; end; @@ -544,6 +545,7 @@ begin // does not save minimized/undocked windows to prevent bugs for i:= 0 to fWidgList.Count-1 do begin + if not fWidgList.widget[i].isDockable then continue; if DockMaster.GetAnchorSite(fWidgList.widget[i]).WindowState = wsMinimized then DockMaster.GetAnchorSite(fWidgList.widget[i]).Close else if DockMaster.GetAnchorSite(fWidgList.widget[i]).SiteType = adhstNone then @@ -1366,7 +1368,12 @@ var begin widg := TCEWidget( TComponent(sender).tag ); if widg = nil then exit; - win := DockMaster.GetAnchorSite(widg); + // + if widg.isDockable then + win := DockMaster.GetAnchorSite(widg) + else + win := widg; + // if win = nil then exit; win.Show; win.BringToFront; @@ -1395,6 +1402,7 @@ begin // TODO-cLCL&LAZ-specific: possible loading AV, xml saved after undocking some widgets, xml file abnormal size. for i:= 0 to fWidgList.Count-1 do begin + if not fWidgList.widget[i].isDockable then continue; if DockMaster.GetAnchorSite(fWidgList.widget[i]).WindowState = wsMinimized then DockMaster.GetAnchorSite(fWidgList.widget[i]).Close else if DockMaster.GetAnchorSite(fWidgList.widget[i]).SiteType = adhstNone then