Changeset 430
- Timestamp:
- Oct 17, 2012, 1:24:58 PM (12 years ago)
- Location:
- Docking/CoolDocking
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
Docking/CoolDocking/Demo/IDE/IDE.lpi
r354 r430 309 309 <Filename Value="..\..\Managers\UCDManagerRegions.pas"/> 310 310 <UnitName Value="UCDManagerRegions"/> 311 <IsVisibleTab Value="True"/> 311 312 <EditorIndex Value="9"/> 312 313 <WindowIndex Value="0"/> 313 <TopLine Value="1 0"/>314 <CursorPos X="4 3" Y="16"/>314 <TopLine Value="177"/> 315 <CursorPos X="42" Y="192"/> 315 316 <UsageCount Value="129"/> 316 317 <Loaded Value="True"/> … … 319 320 <Filename Value="..\..\Managers\UCDManagerTabsPopup.pas"/> 320 321 <UnitName Value="UCDManagerTabsPopup"/> 321 <IsVisibleTab Value="True"/>322 322 <EditorIndex Value="0"/> 323 323 <WindowIndex Value="0"/> 324 324 <TopLine Value="348"/> 325 <CursorPos X=" 3" Y="351"/>325 <CursorPos X="25" Y="351"/> 326 326 <UsageCount Value="120"/> 327 327 <Loaded Value="True"/> … … 355 355 <WindowIndex Value="0"/> 356 356 <TopLine Value="33"/> 357 <CursorPos X="1 " Y="46"/>357 <CursorPos X="16" Y="40"/> 358 358 <UsageCount Value="164"/> 359 359 <Loaded Value="True"/> … … 574 574 <Position1> 575 575 <Filename Value="..\..\UCDPopupMenu.pas"/> 576 <Caret Line=" 245" Column="28" TopLine="232"/>576 <Caret Line="304" Column="9" TopLine="299"/> 577 577 </Position1> 578 578 <Position2> 579 579 <Filename Value="..\..\UCDPopupMenu.pas"/> 580 <Caret Line=" 258" Column="28" TopLine="245"/>580 <Caret Line="313" Column="18" TopLine="300"/> 581 581 </Position2> 582 582 <Position3> 583 <Filename Value="..\..\UCD PopupMenu.pas"/>584 <Caret Line=" 271" Column="28" TopLine="258"/>583 <Filename Value="..\..\UCDManager.pas"/> 584 <Caret Line="79" Column="66" TopLine="61"/> 585 585 </Position3> 586 586 <Position4> 587 <Filename Value="..\..\ UCDPopupMenu.pas"/>588 <Caret Line="2 84" Column="28" TopLine="271"/>587 <Filename Value="..\..\Managers\UCDManagerTabs.pas"/> 588 <Caret Line="21" Column="62" TopLine="4"/> 589 589 </Position4> 590 590 <Position5> 591 <Filename Value="..\..\ UCDPopupMenu.pas"/>592 <Caret Line=" 297" Column="28" TopLine="284"/>591 <Filename Value="..\..\Managers\UCDManagerTabs.pas"/> 592 <Caret Line="16" Column="35" TopLine="8"/> 593 593 </Position5> 594 594 <Position6> 595 <Filename Value="..\..\ UCDPopupMenu.pas"/>596 <Caret Line=" 304" Column="9" TopLine="299"/>595 <Filename Value="..\..\Managers\UCDManagerTabs.pas"/> 596 <Caret Line="21" Column="1" TopLine="8"/> 597 597 </Position6> 598 598 <Position7> 599 <Filename Value="..\..\ UCDPopupMenu.pas"/>600 <Caret Line=" 313" Column="18" TopLine="300"/>599 <Filename Value="..\..\Managers\UCDManagerRegions.pas"/> 600 <Caret Line="23" Column="1" TopLine="8"/> 601 601 </Position7> 602 602 <Position8> 603 <Filename Value="..\..\ UCDManager.pas"/>604 <Caret Line=" 79" Column="66" TopLine="61"/>603 <Filename Value="..\..\Managers\UCDManagerRegions.pas"/> 604 <Caret Line="117" Column="39" TopLine="114"/> 605 605 </Position8> 606 606 <Position9> 607 <Filename Value="..\..\Managers\UCDManager Tabs.pas"/>608 <Caret Line=" 21" Column="62" TopLine="4"/>607 <Filename Value="..\..\Managers\UCDManagerRegions.pas"/> 608 <Caret Line="16" Column="43" TopLine="10"/> 609 609 </Position9> 610 610 <Position10> 611 <Filename Value="..\..\Managers\UCDManagerTabs .pas"/>612 <Caret Line=" 16" Column="35" TopLine="8"/>611 <Filename Value="..\..\Managers\UCDManagerTabsPopup.pas"/> 612 <Caret Line="252" Column="15" TopLine="235"/> 613 613 </Position10> 614 614 <Position11> 615 <Filename Value="..\..\Managers\UCDManagerTabs .pas"/>616 <Caret Line="2 1" Column="1" TopLine="8"/>615 <Filename Value="..\..\Managers\UCDManagerTabsPopup.pas"/> 616 <Caret Line="251" Column="13" TopLine="235"/> 617 617 </Position11> 618 618 <Position12> 619 <Filename Value=" ..\..\Managers\UCDManagerRegions.pas"/>620 <Caret Line=" 23" Column="1" TopLine="8"/>619 <Filename Value="UMainForm.pas"/> 620 <Caret Line="188" Column="7" TopLine="172"/> 621 621 </Position12> 622 622 <Position13> 623 <Filename Value=" ..\..\Managers\UCDManagerRegions.pas"/>624 <Caret Line="1 17" Column="39" TopLine="114"/>623 <Filename Value="UMainForm.pas"/> 624 <Caret Line="167" Column="1" TopLine="150"/> 625 625 </Position13> 626 626 <Position14> 627 <Filename Value=" ..\..\Managers\UCDManagerRegions.pas"/>628 <Caret Line="16 " Column="43" TopLine="10"/>627 <Filename Value="UMainForm.pas"/> 628 <Caret Line="163" Column="73" TopLine="150"/> 629 629 </Position14> 630 630 <Position15> 631 <Filename Value=" ..\..\Managers\UCDManagerTabsPopup.pas"/>632 <Caret Line=" 252" Column="15" TopLine="235"/>631 <Filename Value="UMainForm.pas"/> 632 <Caret Line="183" Column="79" TopLine="162"/> 633 633 </Position15> 634 634 <Position16> 635 <Filename Value="..\..\Managers\UCDManagerTabs Popup.pas"/>636 <Caret Line=" 251" Column="13" TopLine="235"/>635 <Filename Value="..\..\Managers\UCDManagerTabs.pas"/> 636 <Caret Line="395" Column="1" TopLine="373"/> 637 637 </Position16> 638 638 <Position17> 639 <Filename Value=" UMainForm.pas"/>640 <Caret Line="1 88" Column="7" TopLine="172"/>639 <Filename Value="..\..\Managers\UCDManagerTabs.pas"/> 640 <Caret Line="170" Column="1" TopLine="157"/> 641 641 </Position17> 642 642 <Position18> 643 <Filename Value="U MainForm.pas"/>644 <Caret Line=" 167" Column="1" TopLine="150"/>643 <Filename Value="UProjectManagerForm.pas"/> 644 <Caret Line="6" Column="50" TopLine="4"/> 645 645 </Position18> 646 646 <Position19> 647 647 <Filename Value="UMainForm.pas"/> 648 <Caret Line="1 63" Column="73" TopLine="150"/>648 <Caret Line="183" Column="79" TopLine="162"/> 649 649 </Position19> 650 650 <Position20> 651 <Filename Value=" UMainForm.pas"/>652 <Caret Line=" 183" Column="79" TopLine="162"/>651 <Filename Value="H:\Lazarus\1.1_2.6.0\lcl\include\wincontrol.inc"/> 652 <Caret Line="6782" Column="32" TopLine="6763"/> 653 653 </Position20> 654 654 <Position21> 655 <Filename Value=" ..\..\Managers\UCDManagerTabs.pas"/>656 <Caret Line=" 395" Column="1" TopLine="373"/>655 <Filename Value="UMainForm.pas"/> 656 <Caret Line="163" Column="32" TopLine="153"/> 657 657 </Position21> 658 658 <Position22> 659 <Filename Value=" ..\..\Managers\UCDManagerTabs.pas"/>660 <Caret Line=" 170" Column="1" TopLine="157"/>659 <Filename Value="H:\Lazarus\1.1_2.6.0\lcl\include\control.inc"/> 660 <Caret Line="5315" Column="1" TopLine="5302"/> 661 661 </Position22> 662 662 <Position23> 663 <Filename Value=" UProjectManagerForm.pas"/>664 <Caret Line=" 6" Column="50" TopLine="4"/>663 <Filename Value="..\..\Managers\UCDManagerTabsPopup.pas"/> 664 <Caret Line="361" Column="1" TopLine="348"/> 665 665 </Position23> 666 666 <Position24> 667 <Filename Value=" UMainForm.pas"/>668 <Caret Line=" 183" Column="79" TopLine="162"/>667 <Filename Value="H:\Lazarus\1.1_2.6.0\lcl\include\wincontrol.inc"/> 668 <Caret Line="7889" Column="1" TopLine="7876"/> 669 669 </Position24> 670 670 <Position25> 671 <Filename Value=" H:\Lazarus\1.1_2.6.0\lcl\include\wincontrol.inc"/>672 <Caret Line=" 6782" Column="32" TopLine="6763"/>671 <Filename Value="..\..\Managers\UCDManagerTabsPopup.pas"/> 672 <Caret Line="361" Column="1" TopLine="348"/> 673 673 </Position25> 674 674 <Position26> 675 <Filename Value=" UMainForm.pas"/>676 <Caret Line=" 163" Column="32" TopLine="153"/>675 <Filename Value="..\..\UCDConjoinForm.pas"/> 676 <Caret Line="44" Column="7" TopLine="33"/> 677 677 </Position26> 678 678 <Position27> 679 <Filename Value=" H:\Lazarus\1.1_2.6.0\lcl\include\control.inc"/>680 <Caret Line=" 5315" Column="1" TopLine="5302"/>679 <Filename Value="..\..\UCDConjoinForm.pas"/> 680 <Caret Line="42" Column="6" TopLine="33"/> 681 681 </Position27> 682 682 <Position28> 683 <Filename Value="..\..\ Managers\UCDManagerTabsPopup.pas"/>684 <Caret Line=" 361" Column="1" TopLine="348"/>683 <Filename Value="..\..\UCDConjoinForm.pas"/> 684 <Caret Line="54" Column="40" TopLine="33"/> 685 685 </Position28> 686 686 <Position29> 687 <Filename Value=" H:\Lazarus\1.1_2.6.0\lcl\include\wincontrol.inc"/>688 <Caret Line=" 7889" Column="1" TopLine="7876"/>687 <Filename Value="..\..\UCDConjoinForm.pas"/> 688 <Caret Line="52" Column="37" TopLine="33"/> 689 689 </Position29> 690 690 <Position30> 691 <Filename Value="..\..\ Managers\UCDManagerTabsPopup.pas"/>692 <Caret Line=" 361" Column="1" TopLine="348"/>691 <Filename Value="..\..\UCDConjoinForm.pas"/> 692 <Caret Line="40" Column="16" TopLine="33"/> 693 693 </Position30> 694 694 </JumpHistory> … … 731 731 </CompilerOptions> 732 732 <Debugging> 733 <BreakPoints Count=" 2">733 <BreakPoints Count="3"> 734 734 <Item1> 735 735 <Kind Value="bpkSource"/> … … 746 746 <Line Value="371"/> 747 747 </Item2> 748 <Item3> 749 <Kind Value="bpkSource"/> 750 <WatchScope Value="wpsLocal"/> 751 <WatchKind Value="wpkWrite"/> 752 <Source Value="..\..\UCDConjoinForm.pas"/> 753 <Line Value="41"/> 754 </Item3> 748 755 </BreakPoints> 749 756 <Watches Count="1"> -
Docking/CoolDocking/Managers/UCDManagerRegions.pas
r365 r430 22 22 procedure Paint(Sender: TObject); override; 23 23 procedure PanelResize(Sender: TObject); 24 constructor Create; 24 constructor Create; override; 25 25 destructor Destroy; override; 26 26 procedure SetControl(const AValue: TWinControl); override; … … 34 34 FDockItems: TObjectList; // TList<TCDManagerRegionsItem> 35 35 FLastVisibleItemsCount: Integer; 36 function GetHeaderPos: THeaderPos; override;37 procedure SetHeaderPos(const AValue: THeaderPos); override;38 36 function GetDirection(InsertAt: TAlign): TCDDirection; 39 37 procedure ResizePanels; … … 43 41 protected 44 42 FDockDirection: TCDDirection; 43 procedure SetHeaderPos(const AValue: THeaderPos); override; 45 44 public 46 45 //Panels: TObjectList; // TObjectList<TCDStyleRegionsPanel> 46 function GetHeaderPos: THeaderPos; override; 47 47 procedure BringToFront; override; 48 48 function FindControlInPanels(Control: TControl): TCDManagerItem; override; … … 136 136 PanelHeader.Free; 137 137 Splitter.Parent := nil; 138 Splitter.Free;138 FreeAndNil(Splitter); 139 139 if Assigned(Control) then Control.Parent := nil; 140 inherited Destroy;140 inherited; 141 141 end; 142 142 143 143 procedure TCDManagerRegionsItem.SetControl(const AValue: TWinControl); 144 144 begin 145 inherited SetControl(AValue);145 inherited; 146 146 PanelHeader.Header.Control := AValue; 147 147 end; … … 365 365 TCDManagerItem(DockItems[0]).Control.ManualDock(HostDockSite); 366 366 end else TCDManagerItem(DockItems[0]).Control.ManualFloat(Rect(Left, Top, Left + Width, Top + Height)); 367 ManualFloat(Rect(Left, Top, Left + Width, Top + Height));368 inherited RemoveControl(Control);369 Free;367 if FreeIfEmpty then ManualFloat(Rect(Left, Top, Left + Width, Top + Height)); 368 inherited; 369 if FreeIfEmpty then Free; 370 370 Exit; 371 371 end; 372 372 end; 373 inherited RemoveControl(Control);373 inherited; 374 374 if ClientCount > 1 then Update; 375 375 end; -
Docking/CoolDocking/Managers/UCDManagerTabs.pas
r373 r430 75 75 destructor TCDManagerTabsItem.Destroy; 76 76 begin 77 IconImage.Free;78 inherited Destroy;77 FreeAndNil(IconImage); 78 inherited; 79 79 end; 80 80 … … 211 211 destructor TCDManagerTabs.Destroy; 212 212 begin 213 F DockItems.Free;214 PageControl.Free;215 TabImageList.Free;216 inherited Destroy;213 FreeAndNil(FDockItems); 214 FreeAndNil(PageControl); 215 FreeAndNil(TabImageList); 216 inherited; 217 217 end; 218 218 … … 221 221 I: Integer; 222 222 begin 223 inherited PaintSite(DC);223 inherited; 224 224 //PageControl.Invalidate; 225 225 end; … … 281 281 TCDManagerItem(DockItems[0]).Control.ManualDock(HostDockSite); 282 282 end else TCDManagerItem(DockItems[0]).Control.ManualFloat(Rect(Left, Top, Left + Width, Top + Height)); 283 ManualFloat(Rect(Left, Top, Left + Width, Top + Height));283 if FreeIfEmpty then ManualFloat(Rect(Left, Top, Left + Width, Top + Height)); 284 284 //Update; 285 inherited RemoveControl(Control);286 Free;285 inherited; 286 if FreeIfEmpty then Free; 287 287 Exit; 288 288 end; … … 290 290 //if ClientCount > 0 then 291 291 Update; 292 inherited RemoveControl(Control);292 inherited; 293 293 end; 294 294 … … 330 330 procedure TCDManagerTabs.BringToFront; 331 331 begin 332 inherited BringToFront;332 inherited; 333 333 Update; 334 334 end; … … 377 377 NewTabSheet: TTabSheet; 378 378 DeletedPage: TTabSheet; 379 begin 379 LastIndex: Integer; 380 begin 381 LastIndex := PageControl.TabIndex; 380 382 if FUpdateCount = 0 then begin 381 383 DebugLog('TCDManagerTabs.Update'); … … 425 427 TCDManager(Control.DockManager).DockSiteVisible := True; 426 428 if not Control.Visible then Control.Show; 429 //PageControl.TabIndex := I; 427 430 end else begin 428 431 TCDManager(Control.DockManager).DockSiteVisible := False; … … 436 439 end; 437 440 inherited; 441 //ShowMessage(IntToStr(PageControl.TabIndex)); 442 PageControl.TabIndex := LastIndex; 438 443 end; 439 444 -
Docking/CoolDocking/UCDCommon.pas
r355 r430 6 6 7 7 uses 8 Classes, SysUtils, Forms, Controls, Contnrs, StdCtrls,ExtCtrls, ComCtrls;8 Classes, SysUtils, Forms, Controls, Contnrs, ExtCtrls, ComCtrls; 9 9 10 10 type … … 28 28 29 29 TCDConjoinFormBase = class(TForm) 30 public 30 31 constructor Create(TheOwner: TComponent); override; 31 32 end; -
Docking/CoolDocking/UCDConjoinForm.pas
r355 r430 12 12 13 13 TCDConjoinForm = class(TCDConjoinFormBase) 14 protected 15 procedure SetName(const NewName: TComponentName); override; 14 16 public 17 FreeIfEmpty: Boolean; 15 18 CoolDockClient: TCDClientBase; 16 19 UpdateCaptionEnable: Boolean; … … 20 23 constructor Create(TheOwner: TComponent); override; 21 24 destructor Destroy; override; 22 private23 procedure SetName(const NewName: TComponentName); override;24 25 end; 25 26 … … 48 49 if Assigned(HostDockSite) and (HostDockSite is TCDConjoinForm) then 49 50 TCDConjoinForm(HostDockSite).UpdateCaption; 51 //if Assigned(HostDockSite) and (HostDockSite is TCDConjoinForm) then 52 TCDManager(DockManager).Update; 50 53 end; 51 54 end; … … 57 60 58 61 procedure TCDConjoinForm.FormHide(Sender: TObject); 59 var60 I: Integer;61 62 begin 62 63 TCDManager(DockManager).Visible := False; … … 65 66 constructor TCDConjoinForm.Create(TheOwner: TComponent); 66 67 begin 67 inherited CreateNew(TheOwner);68 inherited; 68 69 CoolDockClient := TCDClient.Create(Self); 69 70 with TCDClient(CoolDockClient) do begin … … 73 74 OnHide := FormHide; 74 75 UpdateCaptionEnable := True; 76 FreeIfEmpty := True; 75 77 end; 76 78 -
Docking/CoolDocking/UCDManager.pas
r365 r430 60 60 property HeaderPos: THeaderPos read FHeaderPos write SetHeaderPos; 61 61 property HeaderVisible: Boolean read GetHeaderVisible write SetHeaderVisible; 62 constructor Create(TheOwner: TComponent); 62 constructor Create(TheOwner: TComponent); override; 63 63 destructor Destroy; override; 64 64 end; … … 89 89 FUpdateCount: Integer; 90 90 FDockStyle: TCDStyleType; 91 procedure SetHeaderPos(const AValue: THeaderPos); virtual; 91 92 private 92 93 FDockSite: TWinControl; … … 116 117 procedure InsertControlPanel(Control: TControl; InsertAt: TAlign; 117 118 DropCtl: TControl); virtual; 118 procedure SetHeaderPos(const AValue: THeaderPos); virtual;119 119 function GetHeaderPos: THeaderPos; virtual; 120 120 procedure BringToFront; virtual; … … 552 552 NewConjoinDockForm := TCDConjoinForm.Create(Application); 553 553 NewConjoinDockForm.Name := GetUniqueName('ConjoinForm'); 554 //NewConjoinDockForm.Visible := True;554 NewConjoinDockForm.Visible := True; 555 555 NewConjoinDockForm.BoundsRect := FDockSite.BoundsRect; 556 556 NewConjoinDockForm.CoolDockClient.Master := Self.Master;
Note:
See TracChangeset
for help on using the changeset viewer.