From afa691376e2d4a9a41a3538dd422aa3a2b5ab634 Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Fri, 2 Sep 2011 14:00:49 +0200 Subject: [PATCH] fix unable to change mainWindow's title --- AppKit/CPWindow/CPWindow.j | 4 ++-- AppKit/Platform/CPPlatformWindow.j | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/AppKit/CPWindow/CPWindow.j b/AppKit/CPWindow/CPWindow.j index 2bed398b6..ba3c39732 100644 --- a/AppKit/CPWindow/CPWindow.j +++ b/AppKit/CPWindow/CPWindow.j @@ -480,7 +480,7 @@ CPTexturedBackgroundWindowMask [self close]; _platformWindow = aPlatformWindow; - [_platformWindow setTitle:_title]; + [_platformWindow _setTitle:_title window:self]; if (wasVisible) [self orderFront:self]; @@ -1360,7 +1360,7 @@ CPTexturedBackgroundWindowMask _title = aTitle; [_windowView setTitle:aTitle]; - [_platformWindow setTitle:_title]; + [_platformWindow _setTitle:_title window:self]; [self _synchronizeMenuBarTitleWithWindowTitle]; } diff --git a/AppKit/Platform/CPPlatformWindow.j b/AppKit/Platform/CPPlatformWindow.j index 90ee33215..4526cbd19 100644 --- a/AppKit/Platform/CPPlatformWindow.j +++ b/AppKit/Platform/CPPlatformWindow.j @@ -259,13 +259,12 @@ var PrimaryPlatformWindow = NULL; return [CPPlatform isBrowser]; } -- (void)setTitle:(CPString)aTitle +- (void)_setTitle:(CPString)aTitle window:(CPWindow)aWindow { _title = aTitle; #if PLATFORM(DOM) - if (_DOMWindow && _DOMWindow.document - && (self != [CPPlatformWindow primaryPlatformWindow])) + if (_DOMWindow && _DOMWindow.document && (aWindow === [CPApp mainWindow])) _DOMWindow.document.title = _title; #endif }