Cleanup dead code in MainWindow.

This commit is contained in:
Dzmitry Neviadomski 2021-01-09 12:44:32 +03:00
parent 17dcf4cc9c
commit a112440849
3 changed files with 10 additions and 21 deletions

View file

@ -566,6 +566,7 @@
<toolbarItem reference="1533"/> <toolbarItem reference="1533"/>
</defaultToolbarItems> </defaultToolbarItems>
</toolbar> </toolbar>
<contentBorderThickness minY="22"/>
<connections> <connections>
<binding destination="1897" name="title" keyPath="content.display" id="1903"> <binding destination="1897" name="title" keyPath="content.display" id="1903">
<dictionary key="options"> <dictionary key="options">
@ -576,8 +577,6 @@
</binding> </binding>
<outlet property="delegate" destination="226" id="481"/> <outlet property="delegate" destination="226" id="481"/>
<outlet property="initialFirstResponder" destination="207" id="720"/> <outlet property="initialFirstResponder" destination="207" id="720"/>
<outlet property="itemLionFullscreenToggle" destination="2456" id="5yZ-Jj-awr"/>
<outlet property="itemLionSeparator" destination="2455" id="0p5-i7-wLz"/>
<outlet property="playlistView" destination="206" id="mah-wo-1nd"/> <outlet property="playlistView" destination="206" id="mah-wo-1nd"/>
</connections> </connections>
<point key="canvasLocation" x="130.5" y="131"/> <point key="canvasLocation" x="130.5" y="131"/>
@ -997,10 +996,10 @@
<action selector="decreaseFontSize:" target="226" id="1872"/> <action selector="decreaseFontSize:" target="226" id="1872"/>
</connections> </connections>
</menuItem> </menuItem>
<menuItem isSeparatorItem="YES" hidden="YES" id="2455"> <menuItem isSeparatorItem="YES" id="2455">
<modifierMask key="keyEquivalentModifierMask" command="YES"/> <modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem> </menuItem>
<menuItem title="Enter Full Screen" hidden="YES" keyEquivalent="f" id="2456"> <menuItem title="Enter Full Screen" keyEquivalent="f" id="2456">
<modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/> <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
<connections> <connections>
<action selector="toggleFullScreen:" target="-1" id="2457"/> <action selector="toggleFullScreen:" target="-1" id="2457"/>

View file

@ -9,8 +9,6 @@
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
@interface MainWindow : NSWindow { @interface MainWindow : NSWindow {
IBOutlet NSMenuItem * itemLionSeparator;
IBOutlet NSMenuItem * itemLionFullscreenToggle;
IBOutlet NSView *playlistView; IBOutlet NSView *playlistView;
} }

View file

@ -13,28 +13,20 @@
- (id)initWithContentRect:(NSRect)contentRect styleMask:(NSWindowStyleMask)windowStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)deferCreation - (id)initWithContentRect:(NSRect)contentRect styleMask:(NSWindowStyleMask)windowStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)deferCreation
{ {
self = [super initWithContentRect:contentRect styleMask:windowStyle backing:bufferingType defer:deferCreation]; self = [super initWithContentRect:contentRect styleMask:windowStyle backing:bufferingType defer:deferCreation];
if (self) if (self)
{ {
[self setExcludedFromWindowsMenu:YES]; [self setExcludedFromWindowsMenu:YES];
[self setContentBorderThickness:24.0 forEdge:NSMinYEdge];
[self setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary]; [self setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
} }
return self;
return self;
} }
- (void)awakeFromNib - (void)awakeFromNib
{ {
if ([self respondsToSelector:@selector(toggleFullScreen:)]) [super awakeFromNib];
{
[itemLionSeparator setHidden:NO];
[itemLionFullscreenToggle setHidden:NO];
}
[playlistView setNextResponder:self]; [playlistView setNextResponder:self];
[super awakeFromNib];
} }
@end @end