Changeset 193


Ignore:
Timestamp:
Mar 11, 2011, 10:57:39 AM (13 years ago)
Author:
george
Message:
  • Fixed: Infinite loop in TCDManager SetVisible method.
Location:
Docking/CoolDocking
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • Docking/CoolDocking/CoolDocking.lpk

    r192 r193  
    99      <PathDelim Value="\"/>
    1010      <SearchPaths>
     11        <OtherUnitFiles Value="Managers"/>
    1112        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
    1213      </SearchPaths>
  • Docking/CoolDocking/Demo/IDE/IDE.lpi

    r192 r193  
    204204        <EditorIndex Value="0"/>
    205205        <WindowIndex Value="0"/>
    206         <TopLine Value="1"/>
    207         <CursorPos X="1" Y="1"/>
     206        <TopLine Value="81"/>
     207        <CursorPos X="1" Y="97"/>
    208208        <UsageCount Value="64"/>
    209209        <Loaded Value="True"/>
     
    316316        <TopLine Value="5393"/>
    317317        <CursorPos X="35" Y="5402"/>
    318         <UsageCount Value="30"/>
     318        <UsageCount Value="29"/>
    319319      </Unit29>
    320320      <Unit30>
     
    339339        <Filename Value="..\..\UCDCommon.pas"/>
    340340        <UnitName Value="UCDCommon"/>
    341         <WindowIndex Value="0"/>
    342         <TopLine Value="188"/>
    343         <CursorPos X="9" Y="212"/>
     341        <EditorIndex Value="8"/>
     342        <WindowIndex Value="0"/>
     343        <TopLine Value="1"/>
     344        <CursorPos X="1" Y="1"/>
    344345        <UsageCount Value="55"/>
     346        <Loaded Value="True"/>
    345347      </Unit32>
    346348      <Unit33>
    347349        <Filename Value="..\..\UCDPopupMenu.pas"/>
    348350        <UnitName Value="UCDPopupMenu"/>
    349         <IsVisibleTab Value="True"/>
    350         <EditorIndex Value="2"/>
     351        <EditorIndex Value="3"/>
    351352        <WindowIndex Value="0"/>
    352353        <TopLine Value="31"/>
     
    410411        <Filename Value="..\..\UCDClientPanel.pas"/>
    411412        <UnitName Value="UCDClientPanel"/>
    412         <WindowIndex Value="0"/>
    413         <TopLine Value="3"/>
    414         <CursorPos X="15" Y="102"/>
     413        <EditorIndex Value="4"/>
     414        <WindowIndex Value="0"/>
     415        <TopLine Value="75"/>
     416        <CursorPos X="54" Y="81"/>
    415417        <UsageCount Value="38"/>
     418        <Loaded Value="True"/>
    416419      </Unit41>
    417420      <Unit42>
     
    426429        <Filename Value="..\..\Managers\UCDManagerTabs.pas"/>
    427430        <UnitName Value="UCDManagerTabs"/>
    428         <EditorIndex Value="6"/>
    429         <WindowIndex Value="0"/>
    430         <TopLine Value="133"/>
    431         <CursorPos X="40" Y="145"/>
     431        <EditorIndex Value="9"/>
     432        <WindowIndex Value="0"/>
     433        <TopLine Value="262"/>
     434        <CursorPos X="13" Y="264"/>
    432435        <UsageCount Value="37"/>
    433436        <Loaded Value="True"/>
     
    459462        <Filename Value="..\..\Managers\UCDManagerRegions.pas"/>
    460463        <UnitName Value="UCDManagerRegions"/>
    461         <EditorIndex Value="4"/>
    462         <WindowIndex Value="0"/>
    463         <TopLine Value="130"/>
    464         <CursorPos X="1" Y="140"/>
     464        <EditorIndex Value="6"/>
     465        <WindowIndex Value="0"/>
     466        <TopLine Value="17"/>
     467        <CursorPos X="15" Y="30"/>
    465468        <UsageCount Value="36"/>
    466469        <Loaded Value="True"/>
     
    469472        <Filename Value="..\..\Managers\UCDManagerTabsPopup.pas"/>
    470473        <UnitName Value="UCDManagerTabsPopup"/>
    471         <EditorIndex Value="1"/>
    472         <WindowIndex Value="0"/>
    473         <TopLine Value="52"/>
    474         <CursorPos X="46" Y="52"/>
     474        <EditorIndex Value="2"/>
     475        <WindowIndex Value="0"/>
     476        <TopLine Value="176"/>
     477        <CursorPos X="4" Y="189"/>
    475478        <UsageCount Value="27"/>
    476479        <Loaded Value="True"/>
     
    527530        <Filename Value="..\..\Managers\UCDManagerRegionsPopup.pas"/>
    528531        <UnitName Value="UCDManagerRegionsPopup"/>
    529         <EditorIndex Value="3"/>
    530         <WindowIndex Value="0"/>
    531         <TopLine Value="1"/>
    532         <CursorPos X="39" Y="8"/>
     532        <EditorIndex Value="5"/>
     533        <WindowIndex Value="0"/>
     534        <TopLine Value="8"/>
     535        <CursorPos X="4" Y="29"/>
    533536        <UsageCount Value="11"/>
    534537        <Loaded Value="True"/>
     
    545548        <Filename Value="..\..\UCDManager.pas"/>
    546549        <UnitName Value="UCDManager"/>
    547         <EditorIndex Value="5"/>
    548         <WindowIndex Value="0"/>
    549         <TopLine Value="56"/>
    550         <CursorPos X="44" Y="69"/>
     550        <IsVisibleTab Value="True"/>
     551        <EditorIndex Value="7"/>
     552        <WindowIndex Value="0"/>
     553        <TopLine Value="167"/>
     554        <CursorPos X="1" Y="180"/>
    551555        <UsageCount Value="12"/>
    552556        <Loaded Value="True"/>
     
    555559        <Filename Value="..\..\UCDConjoinForm.pas"/>
    556560        <UnitName Value="UCDConjoinForm"/>
    557         <WindowIndex Value="0"/>
    558         <TopLine Value="49"/>
    559         <CursorPos X="1" Y="54"/>
     561        <EditorIndex Value="1"/>
     562        <WindowIndex Value="0"/>
     563        <TopLine Value="32"/>
     564        <CursorPos X="30" Y="34"/>
    560565        <UsageCount Value="11"/>
     566        <Loaded Value="True"/>
    561567      </Unit58>
    562568      <Unit59>
     
    593599      </Unit62>
    594600    </Units>
    595     <JumpHistory Count="9" HistoryIndex="8">
     601    <JumpHistory Count="30" HistoryIndex="29">
    596602      <Position1>
    597603        <Filename Value="..\..\UCDManager.pas"/>
    598         <Caret Line="318" Column="17" TopLine="312"/>
     604        <Caret Line="115" Column="1" TopLine="102"/>
    599605      </Position1>
    600606      <Position2>
    601607        <Filename Value="..\..\UCDManager.pas"/>
    602         <Caret Line="130" Column="11" TopLine="120"/>
     608        <Caret Line="124" Column="1" TopLine="103"/>
    603609      </Position2>
    604610      <Position3>
    605611        <Filename Value="..\..\UCDManager.pas"/>
    606         <Caret Line="100" Column="1" TopLine="100"/>
     612        <Caret Line="116" Column="1" TopLine="103"/>
    607613      </Position3>
    608614      <Position4>
    609615        <Filename Value="..\..\UCDManager.pas"/>
    610         <Caret Line="28" Column="1" TopLine="15"/>
     616        <Caret Line="118" Column="1" TopLine="103"/>
    611617      </Position4>
    612618      <Position5>
    613         <Filename Value="..\..\UCDClient.pas"/>
    614         <Caret Line="80" Column="29" TopLine="74"/>
     619        <Filename Value="..\..\UCDManager.pas"/>
     620        <Caret Line="119" Column="1" TopLine="103"/>
    615621      </Position5>
    616622      <Position6>
    617         <Filename Value="..\..\UCDClient.pas"/>
    618         <Caret Line="13" Column="14" TopLine="1"/>
     623        <Filename Value="..\..\UCDManager.pas"/>
     624        <Caret Line="121" Column="1" TopLine="103"/>
    619625      </Position6>
    620626      <Position7>
    621         <Filename Value="..\..\UCDClient.pas"/>
    622         <Caret Line="1" Column="1" TopLine="1"/>
     627        <Filename Value="..\..\UCDManager.pas"/>
     628        <Caret Line="122" Column="1" TopLine="103"/>
    623629      </Position7>
    624630      <Position8>
    625         <Filename Value="..\..\UCDPopupMenu.pas"/>
    626         <Caret Line="250" Column="25" TopLine="237"/>
     631        <Filename Value="..\..\UCDManager.pas"/>
     632        <Caret Line="123" Column="1" TopLine="103"/>
    627633      </Position8>
    628634      <Position9>
    629         <Filename Value="..\..\UCDPopupMenu.pas"/>
    630         <Caret Line="1" Column="1" TopLine="1"/>
     635        <Filename Value="..\..\UCDManager.pas"/>
     636        <Caret Line="124" Column="1" TopLine="103"/>
    631637      </Position9>
     638      <Position10>
     639        <Filename Value="..\..\Managers\UCDManagerRegions.pas"/>
     640        <Caret Line="141" Column="1" TopLine="128"/>
     641      </Position10>
     642      <Position11>
     643        <Filename Value="..\..\Managers\UCDManagerRegions.pas"/>
     644        <Caret Line="144" Column="1" TopLine="128"/>
     645      </Position11>
     646      <Position12>
     647        <Filename Value="..\..\Managers\UCDManagerRegions.pas"/>
     648        <Caret Line="152" Column="1" TopLine="131"/>
     649      </Position12>
     650      <Position13>
     651        <Filename Value="..\..\UCDClient.pas"/>
     652        <Caret Line="97" Column="1" TopLine="81"/>
     653      </Position13>
     654      <Position14>
     655        <Filename Value="..\..\UCDConjoinForm.pas"/>
     656        <Caret Line="55" Column="1" TopLine="49"/>
     657      </Position14>
     658      <Position15>
     659        <Filename Value="..\..\UCDConjoinForm.pas"/>
     660        <Caret Line="57" Column="1" TopLine="49"/>
     661      </Position15>
     662      <Position16>
     663        <Filename Value="..\..\UCDConjoinForm.pas"/>
     664        <Caret Line="58" Column="1" TopLine="49"/>
     665      </Position16>
     666      <Position17>
     667        <Filename Value="..\..\UCDConjoinForm.pas"/>
     668        <Caret Line="59" Column="1" TopLine="49"/>
     669      </Position17>
     670      <Position18>
     671        <Filename Value="..\..\UCDManager.pas"/>
     672        <Caret Line="299" Column="1" TopLine="286"/>
     673      </Position18>
     674      <Position19>
     675        <Filename Value="..\..\UCDManager.pas"/>
     676        <Caret Line="300" Column="15" TopLine="286"/>
     677      </Position19>
     678      <Position20>
     679        <Filename Value="..\..\UCDManager.pas"/>
     680        <Caret Line="296" Column="30" TopLine="283"/>
     681      </Position20>
     682      <Position21>
     683        <Filename Value="..\..\UCDConjoinForm.pas"/>
     684        <Caret Line="34" Column="30" TopLine="32"/>
     685      </Position21>
     686      <Position22>
     687        <Filename Value="..\..\UCDManager.pas"/>
     688        <Caret Line="73" Column="43" TopLine="60"/>
     689      </Position22>
     690      <Position23>
     691        <Filename Value="..\..\Managers\UCDManagerTabs.pas"/>
     692        <Caret Line="15" Column="33" TopLine="11"/>
     693      </Position23>
     694      <Position24>
     695        <Filename Value="..\..\UCDManager.pas"/>
     696        <Caret Line="44" Column="15" TopLine="31"/>
     697      </Position24>
     698      <Position25>
     699        <Filename Value="..\..\UCDManager.pas"/>
     700        <Caret Line="166" Column="3" TopLine="164"/>
     701      </Position25>
     702      <Position26>
     703        <Filename Value="..\..\UCDManager.pas"/>
     704        <Caret Line="116" Column="1" TopLine="103"/>
     705      </Position26>
     706      <Position27>
     707        <Filename Value="..\..\UCDManager.pas"/>
     708        <Caret Line="180" Column="1" TopLine="167"/>
     709      </Position27>
     710      <Position28>
     711        <Filename Value="..\..\UCDManager.pas"/>
     712        <Caret Line="181" Column="1" TopLine="167"/>
     713      </Position28>
     714      <Position29>
     715        <Filename Value="..\..\UCDManager.pas"/>
     716        <Caret Line="183" Column="1" TopLine="167"/>
     717      </Position29>
     718      <Position30>
     719        <Filename Value="..\..\UCDManager.pas"/>
     720        <Caret Line="184" Column="1" TopLine="167"/>
     721      </Position30>
    632722    </JumpHistory>
    633723  </ProjectOptions>
     
    657747      <Item1>
    658748        <Source Value="..\..\UCDManager.pas"/>
    659         <Line Value="313"/>
     749        <Line Value="319"/>
    660750      </Item1>
    661751    </BreakPoints>
  • Docking/CoolDocking/Managers/UCDManagerRegions.pas

    r192 r193  
    1414  end;
    1515
    16   { TCDStyleRegions }
    17 
    18   TCDStyleRegions = class(TCDManager)
     16  { TCDManagerRegions }
     17
     18  TCDManagerRegions = class(TCDManager)
    1919  private
    2020    function GetDirection(InsertAt: TAlign): TCDDirection;
     
    2828    destructor Destroy; override;
    2929    procedure UpdateClientSize; override;
    30     procedure DoSetVisible(const AValue: Boolean);
     30    procedure DoSetVisible(const AValue: Boolean); override;
    3131    procedure ChangeVisible(Control: TWinControl; Visible: Boolean);
    3232    property DockDirection: TCDDirection read FDockDirection
     
    4040
    4141
    42 { TCDStyleRegions }
    43 
    44 function TCDStyleRegions.GetDirection(InsertAt: TAlign): TCDDirection;
     42{ TCDManagerRegions }
     43
     44function TCDManagerRegions.GetDirection(InsertAt: TAlign): TCDDirection;
    4545begin
    4646  Result := ddHorizontal;
     
    5353end;
    5454
    55 procedure TCDStyleRegions.InsertControlPanel(Control: TControl; InsertAt: TAlign;
     55procedure TCDManagerRegions.InsertControlPanel(Control: TControl; InsertAt: TAlign;
    5656  DropCtl: TControl);
    5757var
     
    107107end;
    108108
    109 procedure TCDStyleRegions.RemoveControl(Control: TControl);
     109procedure TCDManagerRegions.RemoveControl(Control: TControl);
    110110var
    111111  ClientPanel: TCDClientPanel;
     
    134134end;
    135135
    136 constructor TCDStyleRegions.Create(ADockSite: TWinControl);
    137 var
    138   I: Integer;
    139 begin
    140   inherited;
     136constructor TCDManagerRegions.Create(ADockSite: TWinControl);
     137var
     138  I: Integer;
     139begin
     140  inherited;
     141  FDockStyle := dsList;
    141142  //Panels := TObjectList.Create;
    142143
     
    151152end;
    152153
    153 destructor TCDStyleRegions.Destroy;
     154destructor TCDManagerRegions.Destroy;
    154155begin
    155156  //Panels.Free;
     
    157158end;
    158159
    159 procedure TCDStyleRegions.UpdateClientSize;
     160procedure TCDManagerRegions.UpdateClientSize;
    160161var
    161162  I: Integer;
     
    200201end;
    201202
    202 procedure TCDStyleRegions.DoSetVisible(const AValue: Boolean);
    203 var
    204   I: Integer;
    205 begin
    206 //  inherited SetVisible(AValue);
     203procedure TCDManagerRegions.DoSetVisible(const AValue: Boolean);
     204var
     205  I: Integer;
     206begin
     207  inherited;
    207208  for I := 0 to DockPanels.Count - 1 do
    208209
     
    222223end;
    223224
    224 procedure TCDStyleRegions.ChangeVisible(Control: TWinControl;
     225procedure TCDManagerRegions.ChangeVisible(Control: TWinControl;
    225226  Visible: Boolean);
    226227begin
  • Docking/CoolDocking/Managers/UCDManagerRegionsPopup.pas

    r192 r193  
    66
    77uses
    8   Classes, SysUtils, UCDManagerRegions;
     8  Classes, SysUtils, UCDManagerRegions, UCDCommon, Controls;
    99
    1010type
    11   TCDStylePopupRegions = class(TCDStyleRegions)
    1211
     12  { TCDStylePopupRegions }
     13
     14  TCDStylePopupRegions = class(TCDManagerRegions)
     15    constructor Create(ADockSite: TWinControl);
    1316  end;
    1417
     
    1922  UCDClient;
    2023
     24{ TCDStylePopupRegions }
     25
     26constructor TCDStylePopupRegions.Create(ADockSite: TWinControl);
     27begin
     28  inherited;
     29  FDockStyle := dsPopupList;
     30end;
     31
    2132end.
    2233
  • Docking/CoolDocking/Managers/UCDManagerTabs.pas

    r192 r193  
    1111type
    1212
    13   { TCDStyleTabs }
    14 
    15   TCDStyleTabs = class(TCDManager)
     13  { TCDManagerTabs }
     14
     15  TCDManagerTabs = class(TCDManager)
    1616  public
    1717    MouseDown: Boolean;
     
    3535  public
    3636    constructor Create(ADockSite: TWinControl);
    37     procedure DoSetVisible(const AValue: Boolean);
     37    procedure DoSetVisible(const AValue: Boolean); override;
    3838    destructor Destroy; override;
    3939    procedure ChangeVisible(Control: TWinControl; Visible: Boolean); override;
     
    4949  UCDClient;
    5050
    51 { TCDStyleTabs }
    52 
    53 procedure TCDStyleTabs.PopupMenuTabCloseClick(Sender: TObject);
     51{ TCDManagerTabs }
     52
     53procedure TCDManagerTabs.PopupMenuTabCloseClick(Sender: TObject);
    5454begin
    5555  if Assigned(PageControl.ActivePage) then
     
    5757end;
    5858
    59 procedure TCDStyleTabs.TabControlMouseLeave(Sender: TObject);
     59procedure TCDManagerTabs.TabControlMouseLeave(Sender: TObject);
    6060begin
    6161  if MouseDown then
     
    6767end;
    6868
    69 procedure TCDStyleTabs.TabControlChange(Sender: TObject);
     69procedure TCDManagerTabs.TabControlChange(Sender: TObject);
    7070var
    7171  I: Integer;
     
    120120end;
    121121
    122 procedure TCDStyleTabs.TabControlMouseDown(Sender: TObject;
     122procedure TCDManagerTabs.TabControlMouseDown(Sender: TObject;
    123123  Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
    124124begin
     
    130130end;
    131131
    132 procedure TCDStyleTabs.TabControlMouseUp(Sender: TObject;
     132procedure TCDManagerTabs.TabControlMouseUp(Sender: TObject;
    133133  Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
    134134begin
     
    136136end;
    137137
    138 constructor TCDStyleTabs.Create(ADockSite: TWinControl);
     138constructor TCDManagerTabs.Create(ADockSite: TWinControl);
    139139var
    140140  NewMenuItem: TMenuItem;
     
    144144begin
    145145  inherited;
     146  FDockStyle := dsTabs;
    146147  TabImageList := TImageList.Create(ADockSite); //FDockSite);
    147148  with TabImageList do begin
     
    177178end;
    178179
    179 destructor TCDStyleTabs.Destroy;
     180destructor TCDManagerTabs.Destroy;
    180181begin
    181182  PageControl.Free;
     
    184185end;
    185186
    186 procedure TCDStyleTabs.Switch(Index: Integer);
     187procedure TCDManagerTabs.Switch(Index: Integer);
    187188begin
    188189  PageControl.TabIndex := Index;
    189190end;
    190191
    191 procedure TCDStyleTabs.InsertControlNoUpdate(AControl: TControl; InsertAt: TAlign);
     192procedure TCDManagerTabs.InsertControlNoUpdate(AControl: TControl; InsertAt: TAlign);
    192193var
    193194  NewTabSheet: TTabSheet;
     
    232233end;
    233234
    234 procedure TCDStyleTabs.RemoveControl(Control: TControl);
     235procedure TCDManagerTabs.RemoveControl(Control: TControl);
    235236begin
    236237  inherited RemoveControl(Control);
    237238end;
    238239
    239 procedure TCDStyleTabs.InsertControlPanel(AControl: TControl; InsertAt: TAlign;
     240procedure TCDManagerTabs.InsertControlPanel(AControl: TControl; InsertAt: TAlign;
    240241  DropCtl: TControl);
    241242var
     
    247248end;
    248249
    249 procedure TCDStyleTabs.UpdateClientSize;
     250procedure TCDManagerTabs.UpdateClientSize;
    250251var
    251252  I: Integer;
     
    259260end;
    260261
    261 procedure TCDStyleTabs.DoSetVisible(const AValue: Boolean);
    262 begin
     262procedure TCDManagerTabs.DoSetVisible(const AValue: Boolean);
     263begin
     264  inherited;
    263265    if (PageControl.TabIndex >= 0) and (PageControl.TabIndex < DockPanels.Count) then
    264266      with TCDClientPanel(DockPanels[PageControl.TabIndex]) do begin
     
    274276end;
    275277
    276 procedure TCDStyleTabs.ChangeVisible(Control: TWinControl; Visible: Boolean);
     278procedure TCDManagerTabs.ChangeVisible(Control: TWinControl; Visible: Boolean);
    277279var
    278280  I: Integer;
     
    318320end;
    319321
    320 procedure TCDStyleTabs.SetTabsPos(const AValue: THeaderPos);
     322procedure TCDManagerTabs.SetTabsPos(const AValue: THeaderPos);
    321323begin
    322324  if FTabsPos = AValue then Exit;
  • Docking/CoolDocking/Managers/UCDManagerTabsPopup.pas

    r192 r193  
    4040  { TCDStylePopupTabs }
    4141
    42   TCDStylePopupTabs = class(TCDStyleTabs)
     42  TCDStylePopupTabs = class(TCDManagerTabs)
    4343    TabControl: TTabControl;
    4444    TabImageList: TImageList;
     
    123123constructor TCDAutoHide.Create;
    124124begin
     125  inherited;
    125126  Timer := TTimer.Create(nil);
    126127  Timer.Enabled := False;
     
    186187begin
    187188  inherited;
     189  FDockStyle := dsPopupTabs;
    188190
    189191  AutoHide := TCDAutoHide.Create;
  • Docking/CoolDocking/UCDClient.pas

    r192 r193  
    1111  Buttons, ExtCtrls, Contnrs, Forms, ComCtrls, Dialogs, Menus, FileUtil,
    1212  UCDCustomize, DOM, XMLWrite, XMLRead, UCDCommon,
    13   DateUtils, UCDManagerTabs, UCDManagerRegions, UCDManagerTabsPopup,
    14   UCDManagerRegionsPopup, UCDClientPanel,
    15   UCDPopupMenu, UCDManager;
     13  DateUtils, UCDClientPanel, UCDPopupMenu, UCDManager;
    1614
    1715const
     
    4341
    4442implementation
     43
     44uses
     45  UCDManagerRegions;
    4546
    4647procedure Register;
     
    9192      end;
    9293      UseDockManager := True;
    93       DockManager := TCDManager.Create(TWinControl(AOwner));
     94      DockManager := TCDManagerRegions.Create(TWinControl(AOwner));
    9495    end;
    9596  end;
  • Docking/CoolDocking/UCDManager.pas

    r192 r193  
    2222  TCDManager = class(TCDManagerBase)
    2323  private
    24     FDockStyle: TCDStyleType;
    2524    FDockSite: TWinControl;
    2625    FDockPanels: TCDPanels;
     
    3332    procedure SetVisible(const AValue: Boolean);
    3433  public
     34    FDockStyle: TCDStyleType;
    3535    PopupMenu: TCDPopupMenu;
    3636    constructor Create(ADockSite: TWinControl); override;
     
    4242    procedure InsertControlPanel(Control: TControl; InsertAt: TAlign;
    4343      DropCtl: TControl); virtual;
     44    procedure DoSetVisible(const AValue: Boolean); virtual;
    4445
    4546    // Inherited from TDockManager
     
    161162end;
    162163
     164procedure TCDManager.DoSetVisible(const AValue: Boolean);
     165begin
     166
     167end;
     168
    163169procedure TCDManager.InsertControl(Control: TControl; InsertAt: TAlign;
    164170  DropCtl: TControl);
     
    315321    FDockStyle := AValue;
    316322    if AValue = dsTabs then begin
    317       NewManager := TCDStyleTabs.Create(FDockSite);
    318       TCDStyleTabs(Self).TabControlChange(Self);
     323      NewManager := TCDManagerTabs.Create(FDockSite);
     324      TCDManagerTabs(Self).TabControlChange(Self);
    319325    end else
    320326    if AValue = dsList then begin
    321       NewManager := TCDStyleRegions.Create(FDockSite);
     327      NewManager := TCDManagerRegions.Create(FDockSite);
    322328    end else
    323329    if AValue = dsPopupList then begin
     
    347353  I: Integer;
    348354begin
    349   Visible := AValue;
     355  DoSetVisible(AValue);
     356  //Visible := AValue;
    350357//  for I := 0 to DockPanels.Count - 1 do
    351358//    TCDClientPanel(DockPanels[I]).Visible := AValue;
  • Docking/CoolDocking/UCDPopupMenu.pas

    r192 r193  
    200200  if PopupComponent is TPageControl then
    201201  with TPageControl(PopupComponent) do begin
    202     TCDStyleTabs(Manager).TabsPos := hpAuto;
     202    TCDManagerTabs(Manager).TabsPos := hpAuto;
    203203  end else
    204204  if PopupComponent is TCDHeader then
     
    212212  if PopupComponent is TPageControl then
    213213  with TPageControl(PopupComponent) do begin
    214     TCDStyleTabs(Manager).TabsPos := hpLeft;
     214    TCDManagerTabs(Manager).TabsPos := hpLeft;
    215215  end else
    216216  if PopupComponent is TCDHeader then
     
    224224  if PopupComponent is TPageControl then
    225225  with TPageControl(PopupComponent) do begin
    226     TCDStyleTabs(Manager).TabsPos := hpRight;
     226    TCDManagerTabs(Manager).TabsPos := hpRight;
    227227  end else
    228228  if PopupComponent is TCDHeader then
     
    236236  if PopupComponent is TPageControl then
    237237  with TPageControl(PopupComponent) do begin
    238     TCDStyleTabs(Manager).TabsPos := hpTop;
     238    TCDManagerTabs(Manager).TabsPos := hpTop;
    239239  end else
    240240  if PopupComponent is TCDHeader then
     
    248248  if PopupComponent is TPageControl then
    249249  with TPageControl(PopupComponent) do begin
    250     TCDStyleTabs(Manager).TabsPos := hpBottom;
     250    TCDManagerTabs(Manager).TabsPos := hpBottom;
    251251  end else
    252252  if PopupComponent is TCDHeader then
Note: See TracChangeset for help on using the changeset viewer.