# HG changeset patch # User antonc27 # Date 1441506630 -7200 # Node ID f5e552f97eda500814743cd5522db6d53c0bd918 # Parent 1c89970c7f156e8153b855be52ffb5de866b6c9e - Fixes for cropped background image on iPhone diff -r 1c89970c7f15 -r f5e552f97eda project_files/HedgewarsMobile/Classes/MapConfigViewController-iPhone.xib --- a/project_files/HedgewarsMobile/Classes/MapConfigViewController-iPhone.xib Sun Sep 06 03:17:22 2015 +0200 +++ b/project_files/HedgewarsMobile/Classes/MapConfigViewController-iPhone.xib Sun Sep 06 04:30:30 2015 +0200 @@ -1,34 +1,30 @@ - + - 1056 - 10K549 - 823 - 1038.36 - 461.00 + 1792 + 14E46 + 7706 + 1348.17 + 758.70 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 132 - - - YES - - - - YES - com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 7703 - - YES - - YES - - - YES - - - - YES + + IBProxyObject + IBUIButton + IBUIImageView + IBUILabel + IBUISegmentedControl + IBUISlider + IBUITableView + IBUIView + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + IBFilesOwner IBCocoaTouchFramework @@ -40,18 +36,19 @@ 274 - - YES + - 292 + 274 {480, 276} + + 2 NO IBCocoaTouchFramework NSImage - background~iphone.png + background.png @@ -59,46 +56,42 @@ 292 {{9, 14}, {270, 30}} + NO IBCocoaTouchFramework 2 4 1 - - YES + Random Map Maze Mission - - - YES + + - - - YES + + - - - YES + + {0, 0} {0, 0} {0, 0} {0, 0} - - - YES + + - + 3 MC42NjY2NjY2NjY3AA @@ -109,17 +102,13 @@ 292 {{71, 196}, {145, 44}} + NO YES 7 NO IBCocoaTouchFramework Loading... - - Helvetica-Bold - 17 - 16 - 2 MC45NDExNzY1MzM3IDAuODE1Njg2MzQ1MSAwAA @@ -128,39 +117,59 @@ 1 10 1 + + Helvetica-Bold + Helvetica + 2 + 17 + + + Helvetica-Bold + 17 + 16 + + YES 292 {{16, 58}, {256, 128}} + NO IBCocoaTouchFramework 0 0 - - Helvetica-Bold - 15 - 16 + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA 3 MQA - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - 3 MC41AA + + Helvetica-Bold + Helvetica + 2 + 15 + + + Helvetica-Bold + 15 + 16 + 274 {{284, 0}, {196, 276}} + 3 MCAwAA @@ -183,6 +192,7 @@ 292 {{52, 239}, {184, 23}} + NO IBCocoaTouchFramework 0 @@ -190,20 +200,26 @@ 0.05000000074505806 0.05000000074505806 - + {480, 276} + + YES + 3 3 + + IBUISimulatedFreeformSizeMetricsSentinel + Freeform + IBCocoaTouchFramework - + - - YES + view @@ -229,6 +245,39 @@ 16 + + segmentedControl + + + + 21 + + + + tableView + + + + 32 + + + + slider + + + + 38 + + + + segmentedControlChanged: + + + 13 + + 22 + + sliderChanged: @@ -248,47 +297,6 @@ - segmentedControl - - - - 21 - - - - segmentedControlChanged: - - - 13 - - 22 - - - - dataSource - - - - 26 - - - - delegate - - - - 27 - - - - tableView - - - - 32 - - - delegate @@ -306,34 +314,40 @@ - slider - - + dataSource + + - 38 + 26 - + + + delegate + + + + 27 + + - - YES + 0 - + 1 - - YES + - + @@ -360,9 +374,7 @@ 25 - - YES - + Table View (Themes) @@ -381,343 +393,141 @@ - + - - YES - - YES - -1.CustomClassName - -2.CustomClassName - 1.IBEditorWindowLastContentRect - 1.IBPluginDependency - 11.IBPluginDependency - 11.IBViewBoundsToFrameTransform - 25.IBPluginDependency - 25.IBViewBoundsToFrameTransform - 35.IBPluginDependency - 35.IBViewBoundsToFrameTransform - 7.IBPluginDependency - 7.IBViewBoundsToFrameTransform - 8.CustomClassName - 8.IBPluginDependency - 8.IBViewBoundsToFrameTransform - 9.CustomClassName - 9.IBPluginDependency - 9.IBViewBoundsToFrameTransform - - - YES - MapConfigViewController - UIResponder - {{790, 298}, {480, 320}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - AUKOAABDRAAAA - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAABDjgAAw4kAAA - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAAAAAAAAw4kAAA - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAABBUAAAwigAAA - - MNEValueTrackingSlider - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAABCWAAAw4IAAA - - MapPreviewButtonView - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAABBgAAAwzgAAA - - - - - YES - - - YES - - + + MapConfigViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + MNEValueTrackingSlider + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + MapPreviewButtonView + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + - - YES - - - YES - - + 38 - - YES + MNEValueTrackingSlider UISlider IBProjectSource - Classes/MNEValueTrackingSlider.h + ../Classes/MNEValueTrackingSlider.h MapConfigViewController UIViewController - - YES - - YES - mapButtonPressed: - segmentedControlChanged: - sliderChanged: - sliderEndedChanging: - - - YES - id - id - id - id + + id + id + id + id + + + + mapButtonPressed: + id - - - YES - - YES - mapButtonPressed: - segmentedControlChanged: - sliderChanged: - sliderEndedChanging: + + segmentedControlChanged: + id - - YES - - mapButtonPressed: - id - - - segmentedControlChanged: - id - - - sliderChanged: - id - - - sliderEndedChanging: - id - + + sliderChanged: + id + + + sliderEndedChanging: + id - - - YES - - YES - maxLabel - previewButton - segmentedControl - slider - tableView - - - YES - UILabel - MapPreviewButtonView - UISegmentedControl - MNEValueTrackingSlider - UITableView + + + UILabel + MapPreviewButtonView + UISegmentedControl + MNEValueTrackingSlider + UITableView + + + + maxLabel + UILabel - - - YES - - YES - maxLabel - previewButton - segmentedControl - slider - tableView + + previewButton + MapPreviewButtonView + + + segmentedControl + UISegmentedControl - - YES - - maxLabel - UILabel - - - previewButton - MapPreviewButtonView - - - segmentedControl - UISegmentedControl - - - slider - MNEValueTrackingSlider - - - tableView - UITableView - + + slider + MNEValueTrackingSlider - + + tableView + UITableView + + IBProjectSource - Classes/MapConfigViewController.h + ../Classes/MapConfigViewController.h + + + + MapConfigViewController + + id + id + id + id + + + + mapButtonPressed: + id + + + segmentedControlChanged: + id + + + sliderChanged: + id + + + sliderEndedChanging: + id + + + + IBProjectSource + ../Classes/MapConfigViewController.m MapPreviewButtonView UIButton - - delegate - id - - - delegate - - delegate - id - - IBProjectSource - Classes/MapPreviewButtonView.h - - - - UIButton - - IBProjectSource - Classes/ExtraCategories.h - - - - UILabel - - - - UITableView - - - - - YES - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSError.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyedArchiver.h + ../Classes/MapPreviewButtonView.h - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObject.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSRunLoop.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSThread.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURL.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLConnection.h - - - - NSObject - - IBFrameworkSource - QuartzCore.framework/Headers/CAAnimation.h - - - - NSObject - - IBFrameworkSource - QuartzCore.framework/Headers/CALayer.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIAccessibility.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UINibLoading.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIResponder.h - - + + UIButton UIControl @@ -735,6 +545,14 @@ + UIGestureRecognizer + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIGestureRecognizer.h + + + UIImageView UIView @@ -753,7 +571,10 @@ UIResponder NSObject - + + IBFrameworkSource + UIKit.framework/Headers/UIResponder.h + UIScrollView @@ -805,20 +626,6 @@ UIView - - IBFrameworkSource - UIKit.framework/Headers/UIPrintFormatter.h - - - - UIView - - IBFrameworkSource - UIKit.framework/Headers/UITextField.h - - - - UIView UIResponder IBFrameworkSource @@ -827,59 +634,26 @@ UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UINavigationController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UIPopoverController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UISplitViewController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UITabBarController.h - - - - UIViewController UIResponder IBFrameworkSource UIKit.framework/Headers/UIViewController.h - + 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - + NO com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 - + YES - ../Hedgewars.xcodeproj 3 - background~iphone.png + background.png {480, 320} - 132 diff -r 1c89970c7f15 -r f5e552f97eda project_files/HedgewarsMobile/Classes/MissionTrainingViewController-iPhone.xib --- a/project_files/HedgewarsMobile/Classes/MissionTrainingViewController-iPhone.xib Sun Sep 06 03:17:22 2015 +0200 +++ b/project_files/HedgewarsMobile/Classes/MissionTrainingViewController-iPhone.xib Sun Sep 06 04:30:30 2015 +0200 @@ -1,34 +1,27 @@ - + - 1056 - 10K549 - 823 - 1038.36 - 461.00 + 1792 + 14E46 + 7706 + 1348.17 + 758.70 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 132 - - - YES - - - - YES - com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 7703 - - YES - - YES - - - YES - - - - YES + + IBProxyObject + IBUIButton + IBUIImageView + IBUITableView + IBUIView + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + IBFilesOwner IBCocoaTouchFramework @@ -40,18 +33,19 @@ 274 - - YES + - 292 + 274 {480, 320} + + 2 NO IBCocoaTouchFramework NSImage - smallerBackground~iphone.png + smallerBackground.png @@ -59,6 +53,7 @@ 274 {{180, 0}, {300, 320}} + 3 MQA @@ -80,6 +75,7 @@ 292 {{11, 19}, {157, 130}} + YES NO IBCocoaTouchFramework @@ -89,20 +85,16 @@ 292 {{57, 245}, {64, 64}} + NO IBCocoaTouchFramework 0 0 - - Helvetica-Bold - 15 - 16 - - 1 MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + 3 MC41AA @@ -111,32 +103,46 @@ NSImage backButton.png + + Helvetica-Bold + Helvetica + 2 + 15 + + + Helvetica-Bold + 15 + 16 + 292 {{18, 164}, {142, 64}} + NO 1 IBCocoaTouchFramework 0 0 - - 1 MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + NSImage startGameButton.png + + - + {480, 320} + 3 MQA @@ -145,14 +151,18 @@ + 3 3 + + IBUISimulatedFreeformSizeMetricsSentinel + Freeform + IBCocoaTouchFramework - + - - YES + view @@ -163,6 +173,22 @@ + previewImage + + + + 13 + + + + tableView + + + + 14 + + + dataSource @@ -178,22 +204,6 @@ 12 - - previewImage - - - - 13 - - - - tableView - - - - 14 - - buttonPressed: @@ -211,27 +221,25 @@ 20 - + - - YES + 0 - + 1 - - YES + - + @@ -248,9 +256,7 @@ 9 - - YES - + @@ -273,72 +279,28 @@ - + - - YES - - YES - -1.CustomClassName - -2.CustomClassName - 1.IBEditorWindowLastContentRect - 1.IBPluginDependency - 10.IBPluginDependency - 10.IBViewBoundsToFrameTransform - 17.IBPluginDependency - 17.IBViewBoundsToFrameTransform - 18.IBPluginDependency - 18.IBViewBoundsToFrameTransform - 23.IBPluginDependency - 9.IBPluginDependency - 9.IBViewBoundsToFrameTransform - - - YES - MissionTrainingViewController - UIResponder - {{492, 751}, {480, 320}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAABAoAAAwwYAAA - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAABChAAAw5eAAA - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAABB2AAAw2cAAA - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAABDUAAAw5UAAA - - - - - YES - - - YES - - + + MissionTrainingViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + - - YES - - - YES - - + 23 - - YES + MissionTrainingViewController UIViewController @@ -353,173 +315,50 @@ id - - YES - - YES - descriptionLabel - previewImage - tableView + + UILabel + UIImageView + UITableView + + + + descriptionLabel + UILabel - - YES - UILabel - UIImageView - UITableView + + previewImage + UIImageView + + tableView + UITableView + + + + IBProjectSource + ../Classes/MissionTrainingViewController.h - - YES - - YES - descriptionLabel - previewImage - tableView - - - YES - - descriptionLabel - UILabel - - - previewImage - UIImageView - - - tableView - UITableView - + + + MissionTrainingViewController + + buttonPressed: + id + + + buttonPressed: + + buttonPressed: + id IBProjectSource - Classes/MissionTrainingViewController.h - - - - UIButton - - IBProjectSource - Classes/ExtraCategories.h - - - - UILabel - - - - UITableView - - - - - YES - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSError.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyedArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObject.h + ../Classes/MissionTrainingViewController.m - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSRunLoop.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSThread.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURL.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLConnection.h - - - - NSObject - - IBFrameworkSource - QuartzCore.framework/Headers/CAAnimation.h - - - - NSObject - - IBFrameworkSource - QuartzCore.framework/Headers/CALayer.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIAccessibility.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UINibLoading.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIResponder.h - - + + UIButton UIControl @@ -537,6 +376,14 @@ + UIGestureRecognizer + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIGestureRecognizer.h + + + UIImageView UIView @@ -555,7 +402,10 @@ UIResponder NSObject - + + IBFrameworkSource + UIKit.framework/Headers/UIResponder.h + UIScrollView @@ -591,20 +441,6 @@ UIView - - IBFrameworkSource - UIKit.framework/Headers/UIPrintFormatter.h - - - - UIView - - IBFrameworkSource - UIKit.framework/Headers/UITextField.h - - - - UIView UIResponder IBFrameworkSource @@ -613,70 +449,27 @@ UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UINavigationController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UIPopoverController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UISplitViewController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UITabBarController.h - - - - UIViewController UIResponder IBFrameworkSource UIKit.framework/Headers/UIViewController.h - + 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - + NO com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 - + YES - ../Hedgewars.xcodeproj 3 - - YES - - YES - backButton.png - smallerBackground~iphone.png - startGameButton.png - - - YES - {64, 64} - {480, 320} - {142, 64} - - - 132 + + {64, 64} + {480, 320} + {142, 64} + diff -r 1c89970c7f15 -r f5e552f97eda project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m Sun Sep 06 03:17:22 2015 +0200 +++ b/project_files/HedgewarsMobile/Classes/SchemeWeaponConfigViewController.m Sun Sep 06 04:30:30 2015 +0200 @@ -125,6 +125,8 @@ } else { UIImage *backgroundImage = [[UIImage alloc] initWithContentsOfFile:@"background~iphone.png"]; UIImageView *background = [[UIImageView alloc] initWithImage:backgroundImage]; + background.contentMode = UIViewContentModeScaleAspectFill; + background.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; [backgroundImage release]; [self.view addSubview:background]; [background release]; diff -r 1c89970c7f15 -r f5e552f97eda project_files/HedgewarsMobile/Classes/TeamConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m Sun Sep 06 03:17:22 2015 +0200 +++ b/project_files/HedgewarsMobile/Classes/TeamConfigViewController.m Sun Sep 06 04:30:30 2015 +0200 @@ -45,6 +45,8 @@ } else { UIImage *backgroundImage = [[UIImage alloc] initWithContentsOfFile:@"background~iphone.png"]; UIImageView *background = [[UIImageView alloc] initWithImage:backgroundImage]; + background.contentMode = UIViewContentModeScaleAspectFill; + background.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; [backgroundImage release]; [self.view addSubview:background]; [background release];