paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-23 01:19:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

anchordocking: do not dock OI by default

Browse Source 
git-svn-id: trunk@26208 -
This commit is contained in:
mattias 2010-06-20 14:29:56 +00:00
parent 92c9c1700a
commit e9b21036b9
3 changed files with 48 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
examples/anchordocking/design/ADLayoutDefault.xml
View File

@ -3,31 +3,63 @@
<MainConfig>
<Nodes ChildCount="1">
<Item1 Name="MainIDE" Type="CustomSite" ChildCount="1">
<Bounds Top="25" Width="1594" Height="1083"/>
<Item1 Name="AnchorDockSite1" Type="Layout" ChildCount="5">
<Bounds Top="67" Width="1594" Height="991"/>
<Bounds Top="25" Width="1316" Height="1080"/>
<Item1 Name="AnchorDockSite4" Type="Layout" ChildCount="5">
<Bounds Top="66" Width="1316" Height="989"/>
<Anchors Align="Bottom"/>
<Item1 Name="SourceNotebook" Type="Control">
<Bounds Left="204" Width="1390" Height="881"/>
<Anchors Left="AnchorDockSplitter3" Bottom="AnchorDockSplitter2"/>
<Bounds Width="1142" Height="864"/>
<Anchors Right="AnchorDockSplitter3" Bottom="AnchorDockSplitter2"/>
<Header Position="left"/>
</Item1>
<Item2 Name="AnchorDockSplitter2" Type="SplitterHorizontal">
<Bounds Top="881" Left="204" Width="1390" Height="4"/>
<Anchors Left="AnchorDockSplitter3"/>
<Bounds Top="864" Width="1142" Height="4"/>
<Anchors Right="AnchorDockSplitter3"/>
</Item2>
<Item3 Name="MessagesView" Type="Control">
<Bounds Top="885" Left="204" Width="1390" Height="106"/>
<Anchors Top="AnchorDockSplitter2" Left="AnchorDockSplitter3"/>
<Bounds Top="868" Width="1142" Height="121"/>
<Anchors Top="AnchorDockSplitter2" Right="AnchorDockSplitter3"/>
</Item3>
<Item4 Name="AnchorDockSplitter3" Type="SplitterVertical">
<Bounds Left="200" Width="4" Height="991"/>
<Bounds Left="1142" Width="4" Height="989"/>
</Item4>
<Item5 Name="ObjectInspectorDlg" Type="Control">
<Bounds Width="200" Height="991"/>
<Anchors Right="AnchorDockSplitter3"/>
<Item5 Name="CodeExplorerView" Type="Control">
<Bounds Left="1146" Width="170" Height="989"/>
<Anchors Left="AnchorDockSplitter3"/>
</Item5>
</Item1>
</Item1>
</Nodes>
</MainConfig>
<Restores Count="1">
<Item1 Names="ObjectInspectorDlg">
<Nodes Name="MainIDE" Type="CustomSite" ChildCount="1">
<Bounds Top="25" Width="1142" Height="1080"/>
<Item1 Name="AnchorDockSite4" Type="Layout" ChildCount="5">
<Bounds Top="66" Width="1142" Height="989"/>
<Anchors Align="Bottom"/>
<Item1 Name="SourceNotebook" Type="Control">
<Bounds Left="205" Width="937" Height="864"/>
<Anchors Left="AnchorDockSplitter3" Bottom="AnchorDockSplitter2"/>
<Header Position="left"/>
</Item1>
<Item2 Name="AnchorDockSplitter2" Type="SplitterHorizontal">
<Bounds Top="864" Left="205" Width="937" Height="4"/>
<Anchors Left="AnchorDockSplitter3"/>
</Item2>
<Item3 Name="MessagesView" Type="Control">
<Bounds Top="868" Left="205" Width="937" Height="121"/>
<Anchors Top="AnchorDockSplitter2" Left="AnchorDockSplitter3"/>
</Item3>
<Item4 Name="AnchorDockSplitter3" Type="SplitterVertical">
<Bounds Left="201" Width="4" Height="989"/>
</Item4>
<Item5 Name="ObjectInspectorDlg" Type="Control">
<Bounds Width="201" Height="989"/>
<Anchors Right="AnchorDockSplitter3"/>
</Item5>
</Item1>
</Nodes>
</Item1>
</Restores>
</CONFIG>

7
ide/main.pp
View File

@ -1945,8 +1945,7 @@ begin
ObjectInspector1.OnAutoShow:=@OIOnAutoShow;
ObjectInspector1.PropertyEditorHook:=GlobalDesignHook;
IDEWindowCreators.Add(ObjectInspector1.Name,nil,@CreateIDEWindow,
'0','120','+230','-120',NonModalIDEWindowNames[nmiwSourceNoteBookName],alLeft,
false,@OnGetLayout);
'0','120','+230','-120','',alNone,false,@OnGetLayout);
EnvironmentOptions.ObjectInspectorOptions.AssignTo(ObjectInspector1);
@ -16125,9 +16124,7 @@ begin
if (ObjectInspector1<>nil) and (aFormName=ObjectInspector1.Name) then begin
// place object inspector below main bar
aBounds:=Rect(0,Min(MainIDEBar.Top+MainIDEBar.Height+25,200),230,Screen.Height-150);
// or left of source editor
DockSibling:=NonModalIDEWindowNames[nmiwSourceNoteBookName];
DockAlign:=alLeft;
// do not dock object inspector, because this would hide the designers
end
else if (aFormName=NonModalIDEWindowNames[nmiwMessagesViewName]) then begin
// place messages below source editor

2
lcl/include/customform.inc
View File

@ -374,7 +374,7 @@ procedure TCustomForm.SetFocus;
begin
{$IFDEF VerboseFocus}
DebugLn('TCustomForm.SetFocus ',Name,':',ClassName);
DebugLn('TCustomForm.SetFocus ',Name,':',ClassName,' ActiveControl=',DbgSName(ActiveControl));
{$ENDIF}
if not FActive then
begin