Changeset 186 for Docking


Ignore:
Timestamp:
Mar 10, 2011, 1:32:41 PM (13 years ago)
Author:
george
Message:
  • Modified: Removed TPanel component from TCoolDockConjoinForm to simplify component structure.
Location:
Docking/CoolDocking
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • Docking/CoolDocking/Demo/IDE/IDE.lpi

    r185 r186  
    4747      </Item4>
    4848    </RequiredPackages>
    49     <Units Count="56">
     49    <Units Count="57">
    5050      <Unit0>
    5151        <Filename Value="IDE.lpr"/>
     
    5555        <TopLine Value="11"/>
    5656        <CursorPos X="15" Y="34"/>
    57         <UsageCount Value="122"/>
     57        <UsageCount Value="127"/>
    5858      </Unit0>
    5959      <Unit1>
     
    6363        <ResourceBaseClass Value="Form"/>
    6464        <UnitName Value="UMainForm"/>
    65         <EditorIndex Value="6"/>
    66         <WindowIndex Value="0"/>
    67         <TopLine Value="117"/>
    68         <CursorPos X="1" Y="130"/>
    69         <UsageCount Value="122"/>
     65        <EditorIndex Value="11"/>
     66        <WindowIndex Value="0"/>
     67        <TopLine Value="148"/>
     68        <CursorPos X="49" Y="163"/>
     69        <UsageCount Value="127"/>
    7070        <Loaded Value="True"/>
    7171        <LoadedDesigner Value="True"/>
     
    8080        <TopLine Value="1"/>
    8181        <CursorPos X="12" Y="16"/>
    82         <UsageCount Value="122"/>
     82        <UsageCount Value="127"/>
    8383      </Unit2>
    8484      <Unit3>
     
    8888        <ResourceBaseClass Value="Form"/>
    8989        <UnitName Value="UStructureForm"/>
    90         <EditorIndex Value="3"/>
     90        <EditorIndex Value="8"/>
    9191        <WindowIndex Value="0"/>
    9292        <TopLine Value="1"/>
    9393        <CursorPos X="22" Y="4"/>
    94         <UsageCount Value="122"/>
     94        <UsageCount Value="127"/>
    9595        <Loaded Value="True"/>
    9696        <LoadedDesigner Value="True"/>
     
    105105        <TopLine Value="1"/>
    106106        <CursorPos X="15" Y="10"/>
    107         <UsageCount Value="122"/>
     107        <UsageCount Value="127"/>
    108108      </Unit4>
    109109      <Unit5>
    110110        <Filename Value="E:\Projekty2\FreePascalManager\trunk\Instance\1\Lazarus\lcl\include\control.inc"/>
    111         <EditorIndex Value="9"/>
     111        <EditorIndex Value="14"/>
    112112        <WindowIndex Value="0"/>
    113113        <TopLine Value="1093"/>
    114114        <CursorPos X="1" Y="1106"/>
    115         <UsageCount Value="56"/>
     115        <UsageCount Value="59"/>
    116116        <Loaded Value="True"/>
    117117      </Unit5>
     
    125125        <TopLine Value="1"/>
    126126        <CursorPos X="20" Y="16"/>
    127         <UsageCount Value="122"/>
     127        <UsageCount Value="127"/>
    128128      </Unit6>
    129129      <Unit7>
     
    143143        <TopLine Value="1"/>
    144144        <CursorPos X="7" Y="16"/>
    145         <UsageCount Value="122"/>
     145        <UsageCount Value="127"/>
    146146      </Unit8>
    147147      <Unit9>
     
    154154        <TopLine Value="1"/>
    155155        <CursorPos X="12" Y="15"/>
    156         <UsageCount Value="122"/>
     156        <UsageCount Value="127"/>
    157157      </Unit9>
    158158      <Unit10>
     
    165165        <TopLine Value="1"/>
    166166        <CursorPos X="21" Y="4"/>
    167         <UsageCount Value="122"/>
     167        <UsageCount Value="127"/>
    168168      </Unit10>
    169169      <Unit11>
     
    176176        <TopLine Value="1"/>
    177177        <CursorPos X="12" Y="16"/>
    178         <UsageCount Value="122"/>
     178        <UsageCount Value="127"/>
    179179      </Unit11>
    180180      <Unit12>
     
    187187        <TopLine Value="1"/>
    188188        <CursorPos X="12" Y="17"/>
    189         <UsageCount Value="122"/>
     189        <UsageCount Value="127"/>
    190190      </Unit12>
    191191      <Unit13>
     
    198198        <TopLine Value="1"/>
    199199        <CursorPos X="12" Y="16"/>
    200         <UsageCount Value="122"/>
     200        <UsageCount Value="127"/>
    201201      </Unit13>
    202202      <Unit14>
     
    206206        <ResourceBaseClass Value="Form"/>
    207207        <UnitName Value="USourceEditorForm"/>
    208         <EditorIndex Value="2"/>
     208        <EditorIndex Value="7"/>
    209209        <WindowIndex Value="0"/>
    210210        <TopLine Value="6"/>
    211211        <CursorPos X="31" Y="3"/>
    212         <UsageCount Value="120"/>
     212        <UsageCount Value="125"/>
    213213        <Loaded Value="True"/>
    214214        <LoadedDesigner Value="True"/>
     
    219219        <EditorIndex Value="0"/>
    220220        <WindowIndex Value="0"/>
    221         <TopLine Value="82"/>
    222         <CursorPos X="14" Y="95"/>
    223         <UsageCount Value="60"/>
     221        <TopLine Value="282"/>
     222        <CursorPos X="37" Y="292"/>
     223        <UsageCount Value="62"/>
    224224        <Loaded Value="True"/>
    225225      </Unit15>
     
    228228        <UnitName Value="UCoolDockLayout"/>
    229229        <IsVisibleTab Value="True"/>
    230         <EditorIndex Value="1"/>
    231         <WindowIndex Value="0"/>
    232         <TopLine Value="338"/>
    233         <CursorPos X="30" Y="348"/>
    234         <UsageCount Value="59"/>
     230        <EditorIndex Value="3"/>
     231        <WindowIndex Value="0"/>
     232        <TopLine Value="349"/>
     233        <CursorPos X="22" Y="362"/>
     234        <UsageCount Value="62"/>
    235235        <Loaded Value="True"/>
    236236      </Unit16>
    237237      <Unit17>
    238238        <Filename Value="E:\Projekty2\FreePascalManager\trunk\Instance\1\FPC\rtl\objpas\classes\classesh.inc"/>
    239         <EditorIndex Value="11"/>
    240         <WindowIndex Value="0"/>
    241         <TopLine Value="1883"/>
    242         <CursorPos X="10" Y="1896"/>
    243         <UsageCount Value="32"/>
     239        <EditorIndex Value="16"/>
     240        <WindowIndex Value="0"/>
     241        <TopLine Value="1644"/>
     242        <CursorPos X="14" Y="1657"/>
     243        <UsageCount Value="34"/>
    244244        <Loaded Value="True"/>
    245245      </Unit17>
     
    247247        <Filename Value="E:\Projekty2\FreePascalManager\trunk\Instance\1\FPC\rtl\objpas\types.pp"/>
    248248        <UnitName Value="types"/>
    249         <EditorIndex Value="10"/>
     249        <EditorIndex Value="15"/>
    250250        <WindowIndex Value="0"/>
    251251        <TopLine Value="274"/>
    252252        <CursorPos X="10" Y="287"/>
    253         <UsageCount Value="11"/>
     253        <UsageCount Value="13"/>
    254254        <Loaded Value="True"/>
    255255      </Unit18>
     
    267267        <TopLine Value="110"/>
    268268        <CursorPos X="18" Y="126"/>
    269         <UsageCount Value="27"/>
     269        <UsageCount Value="26"/>
    270270      </Unit20>
    271271      <Unit21>
     
    291291        <Filename Value="E:\Projekty2\FreePascalManager\trunk\Instance\1\Lazarus\lcl\forms.pp"/>
    292292        <UnitName Value="Forms"/>
    293         <WindowIndex Value="0"/>
    294         <TopLine Value="776"/>
    295         <CursorPos X="3" Y="789"/>
     293        <EditorIndex Value="4"/>
     294        <WindowIndex Value="0"/>
     295        <TopLine Value="1623"/>
     296        <CursorPos X="24" Y="1636"/>
    296297        <UsageCount Value="31"/>
     298        <Loaded Value="True"/>
    297299      </Unit23>
    298300      <Unit24>
     
    306308      <Unit25>
    307309        <Filename Value="E:\Projekty2\FreePascalManager\trunk\Instance\1\Lazarus\lcl\include\customcombobox.inc"/>
    308         <EditorIndex Value="7"/>
     310        <EditorIndex Value="12"/>
    309311        <WindowIndex Value="0"/>
    310312        <TopLine Value="913"/>
    311313        <CursorPos X="1" Y="930"/>
    312         <UsageCount Value="24"/>
     314        <UsageCount Value="26"/>
    313315        <Loaded Value="True"/>
    314316      </Unit25>
     
    318320        <TopLine Value="91"/>
    319321        <CursorPos X="1" Y="104"/>
    320         <UsageCount Value="11"/>
     322        <UsageCount Value="10"/>
    321323      </Unit26>
    322324      <Unit27>
     
    330332        <Filename Value="E:\Projekty2\FreePascalManager\trunk\Instance\1\Lazarus\lcl\controls.pp"/>
    331333        <UnitName Value="Controls"/>
    332         <WindowIndex Value="0"/>
    333         <TopLine Value="3859"/>
    334         <CursorPos X="1" Y="3872"/>
     334        <EditorIndex Value="6"/>
     335        <WindowIndex Value="0"/>
     336        <TopLine Value="1397"/>
     337        <CursorPos X="14" Y="1410"/>
    335338        <UsageCount Value="35"/>
     339        <Loaded Value="True"/>
    336340      </Unit28>
    337341      <Unit29>
    338342        <Filename Value="E:\Projekty2\FreePascalManager\trunk\Instance\1\Lazarus\lcl\include\wincontrol.inc"/>
    339         <WindowIndex Value="0"/>
    340         <TopLine Value="7662"/>
    341         <CursorPos X="1" Y="7675"/>
    342         <UsageCount Value="28"/>
     343        <EditorIndex Value="1"/>
     344        <WindowIndex Value="0"/>
     345        <TopLine Value="7763"/>
     346        <CursorPos X="1" Y="7776"/>
     347        <UsageCount Value="29"/>
     348        <Loaded Value="True"/>
    343349      </Unit29>
    344350      <Unit30>
     
    363369        <Filename Value="..\..\UCoolDockCommon.pas"/>
    364370        <UnitName Value="UCoolDockCommon"/>
    365         <WindowIndex Value="0"/>
    366         <TopLine Value="1"/>
    367         <CursorPos X="25" Y="11"/>
    368         <UsageCount Value="50"/>
     371        <EditorIndex Value="2"/>
     372        <WindowIndex Value="0"/>
     373        <TopLine Value="7"/>
     374        <CursorPos X="3" Y="20"/>
     375        <UsageCount Value="53"/>
     376        <Loaded Value="True"/>
    369377      </Unit32>
    370378      <Unit33>
     
    400408      <Unit37>
    401409        <Filename Value="E:\Projekty2\FreePascalManager\trunk\Instance\1\FPC\rtl\objpas\classes\classes.inc"/>
    402         <WindowIndex Value="0"/>
    403         <TopLine Value="7"/>
    404         <CursorPos X="3" Y="20"/>
    405         <UsageCount Value="5"/>
     410        <EditorIndex Value="17"/>
     411        <WindowIndex Value="0"/>
     412        <TopLine Value="514"/>
     413        <CursorPos X="60" Y="523"/>
     414        <UsageCount Value="10"/>
     415        <Loaded Value="True"/>
    406416      </Unit37>
    407417      <Unit38>
     
    423433        <Filename Value="..\..\UCoolDockStyle.pas"/>
    424434        <UnitName Value="UCoolDockStyle"/>
    425         <EditorIndex Value="5"/>
    426         <WindowIndex Value="0"/>
    427         <TopLine Value="10"/>
    428         <CursorPos X="15" Y="23"/>
    429         <UsageCount Value="34"/>
     435        <EditorIndex Value="10"/>
     436        <WindowIndex Value="0"/>
     437        <TopLine Value="53"/>
     438        <CursorPos X="1" Y="66"/>
     439        <UsageCount Value="36"/>
    430440        <Loaded Value="True"/>
    431441      </Unit40>
     
    433443        <Filename Value="..\..\UCoolDockClientPanel.pas"/>
    434444        <UnitName Value="UCoolDockClientPanel"/>
    435         <EditorIndex Value="4"/>
    436         <WindowIndex Value="0"/>
    437         <TopLine Value="259"/>
    438         <CursorPos X="26" Y="270"/>
    439         <UsageCount Value="34"/>
     445        <EditorIndex Value="9"/>
     446        <WindowIndex Value="0"/>
     447        <TopLine Value="150"/>
     448        <CursorPos X="3" Y="152"/>
     449        <UsageCount Value="36"/>
    440450        <Loaded Value="True"/>
    441451      </Unit41>
     
    451461        <Filename Value="..\..\UCoolDockStyleTabs.pas"/>
    452462        <UnitName Value="UCoolDockStyleTabs"/>
    453         <EditorIndex Value="12"/>
     463        <EditorIndex Value="18"/>
    454464        <WindowIndex Value="0"/>
    455465        <TopLine Value="192"/>
    456466        <CursorPos X="52" Y="205"/>
    457         <UsageCount Value="33"/>
     467        <UsageCount Value="35"/>
    458468        <Loaded Value="True"/>
    459469      </Unit43>
     
    484494        <Filename Value="..\..\UCoolDockStyleRegions.pas"/>
    485495        <UnitName Value="UCoolDockStyleRegions"/>
    486         <EditorIndex Value="8"/>
    487         <WindowIndex Value="0"/>
    488         <TopLine Value="64"/>
    489         <CursorPos X="1" Y="76"/>
    490         <UsageCount Value="32"/>
     496        <EditorIndex Value="13"/>
     497        <WindowIndex Value="0"/>
     498        <TopLine Value="82"/>
     499        <CursorPos X="40" Y="120"/>
     500        <UsageCount Value="34"/>
    491501        <Loaded Value="True"/>
    492502      </Unit47>
     
    545555        <TopLine Value="23"/>
    546556        <CursorPos X="15" Y="24"/>
    547         <UsageCount Value="24"/>
     557        <UsageCount Value="28"/>
    548558      </Unit54>
    549559      <Unit55>
     
    555565        <UsageCount Value="10"/>
    556566      </Unit55>
     567      <Unit56>
     568        <Filename Value="E:\Projekty2\FreePascalManager\trunk\Instance\1\FPC\packages\fcl-base\src\custapp.pp"/>
     569        <UnitName Value="CustApp"/>
     570        <EditorIndex Value="5"/>
     571        <WindowIndex Value="0"/>
     572        <TopLine Value="13"/>
     573        <CursorPos X="3" Y="26"/>
     574        <UsageCount Value="10"/>
     575        <Loaded Value="True"/>
     576      </Unit56>
    557577    </Units>
    558578    <JumpHistory Count="30" HistoryIndex="29">
    559579      <Position1>
    560         <Filename Value="UMainForm.pas"/>
    561         <Caret Line="129" Column="1" TopLine="117"/>
     580        <Filename Value="..\..\UCoolDockLayout.pas"/>
     581        <Caret Line="386" Column="36" TopLine="369"/>
    562582      </Position1>
    563583      <Position2>
    564         <Filename Value="UMainForm.pas"/>
    565         <Caret Line="130" Column="72" TopLine="117"/>
     584        <Filename Value="..\..\UCoolDockLayout.pas"/>
     585        <Caret Line="81" Column="17" TopLine="59"/>
    566586      </Position2>
    567587      <Position3>
    568588        <Filename Value="..\..\UCoolDockLayout.pas"/>
    569         <Caret Line="517" Column="54" TopLine="507"/>
     589        <Caret Line="88" Column="32" TopLine="69"/>
    570590      </Position3>
    571591      <Position4>
    572         <Filename Value="UMainForm.pas"/>
    573         <Caret Line="129" Column="1" TopLine="117"/>
     592        <Filename Value="E:\Projekty2\FreePascalManager\trunk\Instance\1\FPC\rtl\objpas\classes\classesh.inc"/>
     593        <Caret Line="3" Column="72" TopLine="1"/>
    574594      </Position4>
    575595      <Position5>
    576         <Filename Value="..\..\UCoolDockLayout.pas"/>
    577         <Caret Line="513" Column="1" TopLine="507"/>
     596        <Filename Value="E:\Projekty2\FreePascalManager\trunk\Instance\1\FPC\rtl\objpas\classes\classesh.inc"/>
     597        <Caret Line="1942" Column="23" TopLine="1921"/>
    578598      </Position5>
    579599      <Position6>
    580         <Filename Value="..\..\UCoolDockLayout.pas"/>
    581         <Caret Line="514" Column="1" TopLine="507"/>
     600        <Filename Value="E:\Projekty2\FreePascalManager\trunk\Instance\1\FPC\rtl\objpas\classes\classesh.inc"/>
     601        <Caret Line="1955" Column="87" TopLine="1934"/>
    582602      </Position6>
    583603      <Position7>
    584604        <Filename Value="..\..\UCoolDockLayout.pas"/>
    585         <Caret Line="515" Column="1" TopLine="507"/>
     605        <Caret Line="88" Column="32" TopLine="69"/>
    586606      </Position7>
    587607      <Position8>
    588608        <Filename Value="..\..\UCoolDockLayout.pas"/>
    589         <Caret Line="516" Column="1" TopLine="507"/>
     609        <Caret Line="83" Column="9" TopLine="70"/>
    590610      </Position8>
    591611      <Position9>
    592612        <Filename Value="..\..\UCoolDockLayout.pas"/>
    593         <Caret Line="514" Column="1" TopLine="507"/>
     613        <Caret Line="90" Column="25" TopLine="77"/>
    594614      </Position9>
    595615      <Position10>
    596616        <Filename Value="..\..\UCoolDockLayout.pas"/>
    597         <Caret Line="515" Column="1" TopLine="507"/>
     617        <Caret Line="541" Column="25" TopLine="519"/>
    598618      </Position10>
    599619      <Position11>
    600620        <Filename Value="..\..\UCoolDockLayout.pas"/>
    601         <Caret Line="516" Column="1" TopLine="507"/>
     621        <Caret Line="397" Column="1" TopLine="380"/>
    602622      </Position11>
    603623      <Position12>
    604624        <Filename Value="..\..\UCoolDockLayout.pas"/>
    605         <Caret Line="515" Column="1" TopLine="507"/>
     625        <Caret Line="398" Column="1" TopLine="380"/>
    606626      </Position12>
    607627      <Position13>
    608628        <Filename Value="..\..\UCoolDockLayout.pas"/>
    609         <Caret Line="516" Column="1" TopLine="507"/>
     629        <Caret Line="397" Column="1" TopLine="380"/>
    610630      </Position13>
    611631      <Position14>
    612         <Filename Value="UMainForm.pas"/>
    613         <Caret Line="130" Column="1" TopLine="117"/>
     632        <Filename Value="..\..\UCoolDockLayout.pas"/>
     633        <Caret Line="82" Column="1" TopLine="69"/>
    614634      </Position14>
    615635      <Position15>
    616636        <Filename Value="..\..\UCoolDockLayout.pas"/>
    617         <Caret Line="513" Column="1" TopLine="507"/>
     637        <Caret Line="83" Column="1" TopLine="69"/>
    618638      </Position15>
    619639      <Position16>
    620640        <Filename Value="..\..\UCoolDockLayout.pas"/>
    621         <Caret Line="516" Column="1" TopLine="507"/>
     641        <Caret Line="84" Column="1" TopLine="69"/>
    622642      </Position16>
    623643      <Position17>
    624         <Filename Value="UMainForm.pas"/>
    625         <Caret Line="118" Column="89" TopLine="117"/>
     644        <Filename Value="..\..\UCoolDockLayout.pas"/>
     645        <Caret Line="85" Column="1" TopLine="69"/>
    626646      </Position17>
    627647      <Position18>
    628648        <Filename Value="..\..\UCoolDockLayout.pas"/>
    629         <Caret Line="513" Column="1" TopLine="507"/>
     649        <Caret Line="88" Column="41" TopLine="69"/>
    630650      </Position18>
    631651      <Position19>
    632652        <Filename Value="..\..\UCoolDockLayout.pas"/>
    633         <Caret Line="516" Column="1" TopLine="507"/>
     653        <Caret Line="400" Column="1" TopLine="387"/>
    634654      </Position19>
    635655      <Position20>
    636         <Filename Value="UMainForm.pas"/>
    637         <Caret Line="130" Column="1" TopLine="117"/>
     656        <Filename Value="..\..\UCoolDockLayout.pas"/>
     657        <Caret Line="88" Column="53" TopLine="75"/>
    638658      </Position20>
    639659      <Position21>
    640660        <Filename Value="..\..\UCoolDockLayout.pas"/>
    641         <Caret Line="513" Column="1" TopLine="507"/>
     661        <Caret Line="400" Column="1" TopLine="387"/>
    642662      </Position21>
    643663      <Position22>
    644664        <Filename Value="..\..\UCoolDockLayout.pas"/>
    645         <Caret Line="516" Column="1" TopLine="507"/>
     665        <Caret Line="401" Column="1" TopLine="387"/>
    646666      </Position22>
    647667      <Position23>
    648         <Filename Value="UMainForm.pas"/>
    649         <Caret Line="130" Column="1" TopLine="117"/>
     668        <Filename Value="..\..\UCoolDockLayout.pas"/>
     669        <Caret Line="400" Column="1" TopLine="387"/>
    650670      </Position23>
    651671      <Position24>
    652672        <Filename Value="..\..\UCoolDockLayout.pas"/>
    653         <Caret Line="513" Column="1" TopLine="507"/>
     673        <Caret Line="401" Column="1" TopLine="387"/>
    654674      </Position24>
    655675      <Position25>
    656676        <Filename Value="..\..\UCoolDockLayout.pas"/>
    657         <Caret Line="516" Column="1" TopLine="507"/>
     677        <Caret Line="418" Column="34" TopLine="396"/>
    658678      </Position25>
    659679      <Position26>
    660680        <Filename Value="..\..\UCoolDockLayout.pas"/>
    661         <Caret Line="514" Column="1" TopLine="507"/>
     681        <Caret Line="400" Column="1" TopLine="395"/>
    662682      </Position26>
    663683      <Position27>
    664684        <Filename Value="..\..\UCoolDockLayout.pas"/>
    665         <Caret Line="515" Column="5" TopLine="507"/>
     685        <Caret Line="401" Column="1" TopLine="395"/>
    666686      </Position27>
    667687      <Position28>
    668688        <Filename Value="..\..\UCoolDockLayout.pas"/>
    669         <Caret Line="510" Column="27" TopLine="507"/>
     689        <Caret Line="417" Column="1" TopLine="396"/>
    670690      </Position28>
    671691      <Position29>
    672692        <Filename Value="..\..\UCoolDockLayout.pas"/>
    673         <Caret Line="517" Column="1" TopLine="507"/>
     693        <Caret Line="418" Column="1" TopLine="397"/>
    674694      </Position29>
    675695      <Position30>
    676696        <Filename Value="..\..\UCoolDockLayout.pas"/>
    677         <Caret Line="523" Column="1" TopLine="507"/>
     697        <Caret Line="420" Column="1" TopLine="399"/>
    678698      </Position30>
    679699    </JumpHistory>
     
    704724      <Item1>
    705725        <Source Value="..\..\UCoolDocking.pas"/>
    706         <Line Value="296"/>
     726        <Line Value="294"/>
    707727      </Item1>
    708728    </BreakPoints>
    709729    <Watches Count="1">
    710730      <Item1>
    711         <Expression Value="AControl.FName"/>
     731        <Expression Value="Form"/>
    712732      </Item1>
    713733    </Watches>
  • Docking/CoolDocking/Demo/IDE/UMainForm.pas

    r185 r186  
    159159    NewContainer1.Show;
    160160
    161     StructureForm.ManualDock(NewContainer1.Panel, nil, alTop);
     161    StructureForm.ManualDock(NewContainer1, nil, alTop);
    162162    StructureForm.Show;
    163     ObjectInspectorForm.ManualDock(NewContainer1.Panel, nil, alTop);
     163    ObjectInspectorForm.ManualDock(NewContainer1, nil, alTop);
    164164    ObjectInspectorForm.Show;
    165165
    166166    NewContainer2 := TCoolDockManager(DockPanel.DockManager).CreateContainer(alRight);
    167167    NewContainer2.Show;
    168     ProjectManagerForm.ManualDock(NewContainer2.Panel, nil, alTop);
     168    ProjectManagerForm.ManualDock(NewContainer2, nil, alTop);
    169169    ProjectManagerForm.Show;
    170     ToolPaletteForm.ManualDock(NewContainer2.Panel, nil, alTop);
     170    ToolPaletteForm.ManualDock(NewContainer2, nil, alTop);
    171171    ToolPaletteForm.Show;
    172172
  • Docking/CoolDocking/UCoolDockLayout.pas

    r185 r186  
    77uses
    88  Classes, SysUtils, FileUtil, Contnrs, URectangle, Forms, UCoolDockCommon,
    9   DOM, XMLWrite, XMLRead, Controls;
     9  DOM, XMLWrite, XMLRead, Controls, Dialogs;
    1010
    1111type
     
    7777end;
    7878
     79function FindGlobalComponentDeep(Name: string): TComponent;
     80var
     81  I: Integer;
     82begin
     83  for I := 0 to Application.ComponentCount - 1 do begin
     84    Result := Application.Components[I];
     85    if Result.Name = Name then Exit
     86      else begin
     87        Result := Result.FindComponent(Name);
     88        if Assigned(Result) and (Result.Name = Name) then Exit;
     89      end;
     90  end;
     91end;
     92
    7993{ TCoolDockLayoutList }
    8094
     
    346360    else ParentName := '';
    347361  if Assigned(Form.HostDockSite) then begin
    348     if Assigned(Form.HostDockSite.Parent) and (Form.HostDockSite.Parent is TForm) then
     362    if Assigned(Form.HostDockSite) then
    349363    begin
    350       HostDockSiteName := Form.HostDockSite.Parent.Name;
     364      HostDockSiteName := Form.HostDockSite.Name;
    351365      if not Assigned(Parent.FindByName(HostDockSiteName)) then begin
    352366        NewItem := TCoolDockLayoutItem.Create;
    353367        NewItem.Parent := Parent;
    354         NewItem.DockStyle := TCoolDockManager(Form.HostDockSite.Parent.DockManager).DockStyle;
     368        NewItem.DockStyle := TCoolDockManager(Form.HostDockSite.DockManager).DockStyle;
    355369        Parent.Items.Add(NewItem);
    356         NewItem.Store(Form.HostDockSite.Parent);
     370        NewItem.Store(Form.HostDockSite);
    357371      end;
    358372    end;
     
    383397  Form.Visible := Visible;
    384398  if HostDockSiteName <> '' then begin
    385     ParentComponent := FindGlobalComponent(HostDockSiteName);
     399    ParentComponent := FindGlobalComponentDeep(HostDockSiteName);
    386400    if not Assigned(ParentComponent) then begin
    387401      ParentLayoutItem := Parent.FindByName(HostDockSiteName);
     
    393407            if FormClass = TCoolDockConjoinForm then begin
    394408              ParentComponent := TCoolDockManager(Form.DockManager).CreateContainer(alNone);
    395               TCoolDockManager(TCoolDockConjoinForm(ParentComponent).Panel.DockManager).DockStyle := ParentLayoutItem.DockStyle;
     409              TCoolDockManager(TCoolDockConjoinForm(ParentComponent).DockManager).DockStyle := ParentLayoutItem.DockStyle;
    396410              ParentLayoutItem.Restore(TWinControl(ParentComponent));
    397411            end;
     
    400414      end;
    401415    end;
    402     if Assigned(ParentComponent) and (ParentComponent is TCoolDockConjoinForm) then
    403       Form.ManualDock(TCoolDockConjoinForm(ParentComponent).Panel);
     416    if Assigned(ParentComponent) and (ParentComponent is TWinControl) then
     417      Form.ManualDock(TWinControl(ParentComponent));
    404418  end;
    405419  Processed := True;
  • Docking/CoolDocking/UCoolDockStyleRegions.pas

    r185 r186  
    7474        // FDockSite.ManualFloat(FDockSite.BoundsRect);
    7575        NewConjoinDockForm.ManualDock(NewDockSite);
    76         AControl.ManualDock(NewConjoinDockForm.Panel, nil, InsertAt);
     76        AControl.ManualDock(NewConjoinDockForm, nil, InsertAt);
    7777        if DockSite is TForm then
    78           DockSite.ManualDock(NewConjoinDockForm.Panel)
     78          DockSite.ManualDock(NewConjoinDockForm)
    7979        else
    8080        if DockSite is TPanel then
    81           DockSite.Parent.ManualDock(NewConjoinDockForm.Panel);
     81          DockSite.Parent.ManualDock(NewConjoinDockForm);
    8282        UpdateClientSize;
    8383        Exit;
     
    110110var
    111111  ClientPanel: TCoolDockClientPanel;
     112  ClientCount: Integer;
    112113begin
    113114  ClientPanel := TCoolDockManager(Manager).FindControlInPanels(Control);
     
    115116
    116117  TCoolDockManager(Manager).DockPanels.Remove(ClientPanel);
     118  ClientCount := TCoolDockManager(Manager).DockPanels.Count;
    117119
    118120  //if TCoolDockManager(Manager).DockSite.DockClientCount = 2 then FDockDirection := ddNone;
    119   if TCoolDockManager(Manager).DockPanels.Count = 1 then begin
     121  if ClientCount = 1 then begin
    120122    // Last removed control => Free parent if it is TCoolDockConjoinForm
    121     if TCoolDockManager(Manager).DockSite.Parent is TCoolDockConjoinForm then
    122     with TCoolDockConjoinForm(TCoolDockManager(Manager).DockSite.Parent) do begin
     123    if TCoolDockManager(Manager).DockSite is TCoolDockConjoinForm then
     124    with TCoolDockConjoinForm(TCoolDockManager(Manager).DockSite) do begin
    123125      if Assigned(Parent) then begin
    124126        TCoolDockClientPanel(TCoolDockManager(Manager).DockPanels[0]).Control.ManualDock(HostDockSite);
     
    129131  end;
    130132  inherited RemoveControl(Control);
     133  if ClientCount > 1 then UpdateClientSize;
    131134end;
    132135
     
    191194      else Align := alClient;
    192195
     196    Inc(SplitterLeft, Width);
     197    Inc(SplitterTop, Height);
    193198    Splitter.Left := SplitterLeft;
    194199    Splitter.Top := SplitterTop;
    195     Inc(SplitterLeft, Width);
    196     Inc(SplitterTop, Height);
    197200    Splitter.Parent := TCoolDockManager(Manager).DockSite;
    198201    Splitter.Align := BaseAlign;
    199202    Splitter.Visible := I < (DockPanels.Count - 1);
    200 
     203    Inc(SplitterLeft, Splitter.Width);
     204    Inc(SplitterTop, Splitter.Height);
    201205
    202206    DockPanelPaint(Self);
  • Docking/CoolDocking/UCoolDocking.pas

    r185 r186  
    2727  TCoolDockConjoinForm = class(TCoolDockConjoinFormBase)
    2828  public
    29     Panel: TPanel;
    3029    CoolDockClient: TCoolDockClient;
    3130    procedure FormShow(Sender : TObject);
     
    3534  private
    3635    procedure SetName(const NewName: TComponentName); override;
    37     procedure PanelVisibleChange(Sender: TObject);
    3836  end;
    3937
     
    287285  NewForm: TForm;
    288286begin
    289   if (FDockSite is TForm) then begin
     287  if (FDockSite is TForm) and (not (FDockSite is TCoolDockConjoinForm)) then begin
    290288    if (not Assigned(FDockSite.Parent)) then begin
    291289      // Create conjointed form
    292290      NewConjoinDockForm := CreateContainer(InsertAt);
    293       FDockSite.ManualDock(NewConjoinDockForm.Panel);
    294       Control.ManualDock(NewConjoinDockForm.Panel, nil, InsertAt);
     291      FDockSite.ManualDock(NewConjoinDockForm);
     292      Control.ManualDock(NewConjoinDockForm, nil, InsertAt);
    295293    end else begin
    296294      NewConjoinDockForm := CreateContainer(InsertAt);
     
    298296//      FDockSite.ManualFloat(FDockSite.BoundsRect);
    299297      NewConjoinDockForm.ManualDock(NewDockSite, nil, InsertAt);
    300       FDockSite.ManualDock(NewConjoinDockForm.Panel);
    301       Control.ManualDock(NewConjoinDockForm.Panel, nil, InsertAt);
     298      FDockSite.ManualDock(NewConjoinDockForm);
     299      Control.ManualDock(NewConjoinDockForm, nil, InsertAt);
    302300    end;
    303301  end else
    304   if (FDockSite is TPanel) or (FDockSite is TCoolDockClientPanel) then begin
     302  if (FDockSite is TCoolDockConjoinForm) or (FDockSite is TPanel) or (FDockSite is TCoolDockClientPanel) then begin
    305303    InsertControlPanel(Control, InsertAt, DropCtl);
    306304  end;
     
    479477procedure TCoolDockConjoinForm.FormShow(Sender: TObject);
    480478begin
    481   Panel.Show;
    482   TCoolDockManager(Panel.DockManager).Visible := True;
     479  TCoolDockManager(DockManager).Visible := True;
    483480end;
    484481
     
    487484  I: Integer;
    488485begin
    489   Panel.Hide;
    490   TCoolDockManager(Panel.DockManager).Visible := False;
     486  TCoolDockManager(DockManager).Visible := False;
    491487  // Hide all docked childs
    492   with TCoolDockManager(Panel.DockManager) do
     488  with TCoolDockManager(DockManager) do
    493489  for I := 0 to DockPanels.Count - 1 do
    494490    if Assigned(TCoolDockClientPanel(DockPanels[I]).Control) then begin
     
    501497begin
    502498  inherited CreateNew(TheOwner);
    503   Panel := TPanel.Create(Self);
    504   with Panel do begin
    505     Parent := Self;
    506     Caption := '';
    507     DockSite := True;
    508     UseDockManager := True;
    509     Align := alClient;
    510     BevelOuter := bvNone;
    511     BevelInner := bvNone;
    512   //  Color := clYellow;
    513   end;
    514499  CoolDockClient := TCoolDockClient.Create(Self);
    515500  with CoolDockClient do begin
    516     Panel := Self.Panel;
    517501  end;
    518502  OnShow := FormShow;
    519503  OnHide := FormHide;
    520 
    521   Panel.AddHandlerOnVisibleChanged(PanelVisibleChange);
    522504end;
    523505
    524506destructor TCoolDockConjoinForm.Destroy;
    525507begin
    526   Panel.RemoveHandlerOnVisibleChanged(PanelVisibleChange);
    527508  inherited;
    528509end;
     
    531512begin
    532513  inherited SetName(NewName);
    533   Panel.Name := Name + 'Panel';
    534   Panel.Caption := '';
    535514  CoolDockClient.Name := Name + 'CoolDockClient';
    536 end;
    537 
    538 procedure TCoolDockConjoinForm.PanelVisibleChange(Sender: TObject);
    539 begin
    540   Visible := Panel.Visible;
    541515end;
    542516
Note: See TracChangeset for help on using the changeset viewer.