Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for 215296, r=bryner, sr=brendan, a=asa, This patch retains Seamonkey's behavior for titles on all platforms while patching Mac behavior to leave off the modifier for FB+TB

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@145900 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
hyatt%mozilla.org
2003-08-12 05:51:39 +00:00
parent af92b9ffc8
commit 094286a08f
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp
View File

@@ -710,10 +710,23 @@ void nsContentTreeOwner::XULWindow(nsXULWindow* aXULWindow)
if(contentTitleSetting.Equals(NS_LITERAL_STRING("true")))
{
mContentTitleSetting = PR_TRUE;
docShellElement->GetAttribute(NS_LITERAL_STRING("titlemodifier"), mWindowTitleModifier);
docShellElement->GetAttribute(NS_LITERAL_STRING("titlemenuseparator"), mTitleSeparator);
docShellElement->GetAttribute(NS_LITERAL_STRING("titlepreface"), mTitlePreface);
docShellElement->GetAttribute(NS_LITERAL_STRING("titledefault"), mTitleDefault);
docShellElement->GetAttribute(NS_LITERAL_STRING("titlemodifier"), mWindowTitleModifier);
docShellElement->GetAttribute(NS_LITERAL_STRING("titlepreface"), mTitlePreface);
#if defined(XP_MACOSX) && defined(MOZ_XUL_APP)
// On OS X, treat the titlemodifier like it's the titledefault, and don't ever append
// the separator + appname.
if (mTitleDefault.IsEmpty()) {
docShellElement->SetAttribute(NS_LITERAL_STRING("titledefault"),
mWindowTitleModifier);
docShellElement->RemoveAttribute(NS_LITERAL_STRING("titlemodifier"));
mTitleDefault = mWindowTitleModifier;
mWindowTitleModifier.Truncate();
}
#else
docShellElement->GetAttribute(NS_LITERAL_STRING("titlemenuseparator"), mTitleSeparator);
#endif
}
}
else