Improve code style (#126)

kasper · Aug 4, 2016 · 93fc05c · 93fc05c
1 parent 8ed973c
commit 93fc05c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/Phoenix/PHModalWindowController.h b/Phoenix/PHModalWindowController.h
@@ -29,9 +29,6 @@
 
 - (NSRect) frame;
 - (void) show;
-
-#pragma mark - Closing
-
 - (void) close;
 
 @end

diff --git a/Phoenix/PHModalWindowController.m b/Phoenix/PHModalWindowController.m
@@ -6,11 +6,14 @@
 
 @interface PHModalWindowController ()
 
-#pragma mark - IBOutlet
+#pragma mark - Views
 
 @property (weak) IBOutlet NSView *containerView;
 @property (weak) IBOutlet NSImageView *iconView;
 @property (weak) IBOutlet NSTextField *textField;
+
+#pragma mark - Constraints
+
 @property (weak) IBOutlet NSLayoutConstraint *iconViewZeroWidthConstraint;
 @property (weak) IBOutlet NSLayoutConstraint *separatorConstraint;
 
@@ -189,6 +192,11 @@ - (void) observeValueForKeyPath:(NSString *)keyPath
 
 #pragma mark - Displaying
 
+- (BOOL) isDisplayable {
+
+    return self.icon || [self hasText] || isnan(self.origin.x) || isnan(self.origin.y);
+}
+
 - (void) layout {
 
     self.iconViewZeroWidthConstraint.priority = !self.icon ? 999 : NSLayoutPriorityDefaultLow;
@@ -212,14 +220,9 @@ - (void) fadeWindowToAlpha:(CGFloat)alpha completionHandler:(void (^)())completi
     } completionHandler:completionHandler];
 }
 
-- (BOOL) isDisplayable {
-
-    return self.icon || [self hasText];
-}
-
 - (void) show {
 
-    if (![self isDisplayable] || isnan(self.origin.x) || isnan(self.origin.y)) {
+    if (![self isDisplayable]) {
         return;
     }
 
@@ -240,8 +243,6 @@ - (void) show {
     }];
 }
 
-#pragma mark - Closing
-
 - (void) close {
 
     [self fadeWindowToAlpha:0.0 completionHandler:^{