Bug 537044 - toggletoolbar attribute ignored when returning from full screen. r=josh

This commit is contained in:
Markus Stange 2009-12-30 16:24:03 +01:00
parent 4fe4a5edb5
commit 91349cb411

View File

@ -1763,6 +1763,7 @@ static const NSString* kStateTitleKey = @"title";
static const NSString* kStateDrawsContentsIntoWindowFrameKey = @"drawsContentsIntoWindowFrame";
static const NSString* kStateActiveTitlebarColorKey = @"activeTitlebarColor";
static const NSString* kStateInactiveTitlebarColorKey = @"inactiveTitlebarColor";
static const NSString* kStateShowsToolbarButton = @"showsToolbarButton";
- (void)importState:(NSDictionary*)aState
{
@ -1770,6 +1771,7 @@ static const NSString* kStateInactiveTitlebarColorKey = @"inactiveTitlebarColor"
[self setDrawsContentsIntoWindowFrame:[[aState objectForKey:kStateDrawsContentsIntoWindowFrameKey] boolValue]];
[self setTitlebarColor:[aState objectForKey:kStateActiveTitlebarColorKey] forActiveWindow:YES];
[self setTitlebarColor:[aState objectForKey:kStateInactiveTitlebarColorKey] forActiveWindow:NO];
[self setShowsToolbarButton:[[aState objectForKey:kStateShowsToolbarButton] boolValue]];
}
- (NSMutableDictionary*)exportState
@ -1786,6 +1788,8 @@ static const NSString* kStateInactiveTitlebarColorKey = @"inactiveTitlebarColor"
if (inactiveTitlebarColor) {
[state setObject:inactiveTitlebarColor forKey:kStateInactiveTitlebarColorKey];
}
[state setObject:[NSNumber numberWithBool:[self showsToolbarButton]]
forKey:kStateShowsToolbarButton];
return state;
}