Merge branch 'a11_2_a12'

This commit is contained in:
Basile Burg 2015-01-28 00:34:55 +01:00
commit b6505dc96a
2 changed files with 2 additions and 2 deletions

View File

@ -523,7 +523,7 @@ begin
for i := 0 to fWidgList.Count-1 do for i := 0 to fWidgList.Count-1 do
begin begin
DockMaster.MakeDockable(fWidgList.widget[i], false); DockMaster.MakeDockable(fWidgList.widget[i], not fileExists(getCoeditDocPath + 'docking.xml'));
DockMaster.GetAnchorSite(fWidgList.widget[i]).Header.HeaderPosition := adlhpTop; DockMaster.GetAnchorSite(fWidgList.widget[i]).Header.HeaderPosition := adlhpTop;
end; end;

View File

@ -405,7 +405,7 @@ begin
loadCache; loadCache;
// //
fModified := false; fModified := false;
setFocus; if Showing then setFocus;
subjDocChanged(TCEMultiDocSubject(fMultiDocSubject), self); subjDocChanged(TCEMultiDocSubject(fMultiDocSubject), self);
end; end;