マジックナンバーを排除

diff --git a/KCD/HMBroserWindowController.m b/KCD/HMBroserWindowController.m
index dcf5273..9ea84c2 100644 (file)
--- a/KCD/HMBroserWindowController.m
+++ b/KCD/HMBroserWindowController.m
@@ -234,11 +234,8 @@ typedef NS_ENUM(NSUInteger, FleetViewPosition) {
 
 
 #pragma mark - FleetView position
-const CGFloat margin = 1;
-
 // ###############################
-const CGFloat oldStyleFleetViewHeight = 128;
-const CGFloat heightDifference = 288 - oldStyleFleetViewHeight;
+const CGFloat margin = 1;
 const CGFloat flashTopMargin = 4;
 // ###############################
 
@@ -270,10 +267,10 @@ const CGFloat flashTopMargin = 4;
        if(self.fleetViewPosition == fleetViewPosition) return windowContentHeight;
        
        if(self.fleetViewPosition == kOldStyle) {
-               windowContentHeight += heightDifference;
+               windowContentHeight += HMFleetViewController.heightDifference;
        }
        if(fleetViewPosition == kOldStyle) {
-               windowContentHeight -= heightDifference;
+               windowContentHeight -= HMFleetViewController.heightDifference;
        }
        
        return windowContentHeight;
@@ -285,12 +282,12 @@ const CGFloat flashTopMargin = 4;
        if(self.fleetViewPosition == fleetViewPosition) return windowContentRect;
        
        if(self.fleetViewPosition == kOldStyle) {
-               windowContentRect.size.height += heightDifference;
-               windowContentRect.origin.y -= heightDifference;
+               windowContentRect.size.height += HMFleetViewController.heightDifference;
+               windowContentRect.origin.y -= HMFleetViewController.heightDifference;
        }
        if(fleetViewPosition == kOldStyle) {
-               windowContentRect.size.height -= heightDifference;
-               windowContentRect.origin.y += heightDifference;
+               windowContentRect.size.height -= HMFleetViewController.heightDifference;
+               windowContentRect.origin.y += HMFleetViewController.heightDifference;
        }
        
        return windowContentRect;
@@ -348,7 +345,7 @@ const CGFloat flashTopMargin = 4;
                        fleetViewY = windowContentHeight - fleetViewHeight;
                        break;
                case kOldStyle:
-                       fleetViewHeight = oldStyleFleetViewHeight;
+                       fleetViewHeight = HMFleetViewController.oldStyleFleetViewHeight;
                        fleetViewY = windowContentHeight - fleetViewHeight - flashRect.size.height - margin - flashTopMargin;
                        break;
                default:

diff --git a/KCD/HMFleetViewController.h b/KCD/HMFleetViewController.h
index 7cb537d..d43f415 100644 (file)
--- a/KCD/HMFleetViewController.h
+++ b/KCD/HMFleetViewController.h
@@ -25,6 +25,11 @@ typedef NS_ENUM(NSInteger, HMFleetViewShipOrder) {
 
 - (instancetype)initWithViewType:(HMFleetViewType)type;
 
++ (CGFloat)oldStyleFleetViewHeight;
++ (CGFloat)detailViewHeight;
++ (CGFloat)heightDifference;
+
+
 @property (readonly) HMFleetViewType type;
 
 @property (strong) HMKCDeck* fleet;

diff --git a/KCD/HMFleetViewController.m b/KCD/HMFleetViewController.m
index dbadb6e..0e1cc5c 100644 (file)
--- a/KCD/HMFleetViewController.m
+++ b/KCD/HMFleetViewController.m
@@ -195,9 +195,9 @@
 {
        switch(self.type) {
                case detailViewType:
-                       return 288;
+                       return HMFleetViewController.detailViewHeight;
                case minimumViewType:
-                       return 128;
+                       return HMFleetViewController.oldStyleFleetViewHeight;
        }
        return 0;
 }
@@ -207,11 +207,24 @@
                case detailViewType:
                        return 159;
                case minimumViewType:
-                       return 128;
+                       return HMFleetViewController.oldStyleFleetViewHeight;
        }
        return 0;
 }
 
++ (CGFloat)oldStyleFleetViewHeight
+{
+       return 128;
+}
++ (CGFloat)detailViewHeight
+{
+       return 288;
+}
++ (CGFloat)heightDifference
+{
+       return self.detailViewHeight - self.oldStyleFleetViewHeight;
+}
+
 
 + (NSSet *)keyPathsForValuesAffectingTotalSakuteki
 {