# HG changeset patch
# User koda
# Date 1288308495 -7200
# Node ID d87619de120dd1a905615be01e405aeccf0db852
# Parent c76c895825ab5bf25c6d741fe8db5a84c498cb14
fix an annoying bug that didn't allow returning to the ifrontend
diff -r c76c895825ab -r d87619de120d project_files/HedgewarsMobile/Classes/InGameMenuViewController.m
--- a/project_files/HedgewarsMobile/Classes/InGameMenuViewController.m Fri Oct 29 00:25:18 2010 +0200
+++ b/project_files/HedgewarsMobile/Classes/InGameMenuViewController.m Fri Oct 29 01:28:15 2010 +0200
@@ -150,7 +150,7 @@
break;
case 2:
// expand the view (and table) so that the actionsheet can be selected on the iPhone
- if (IS_IPAD()) {
+ if (IS_IPAD() == NO) {
CGRect screen = [[UIScreen mainScreen] bounds];
[self.tableView deselectRowAtIndexPath:indexPath animated:NO];
[UIView beginAnimations:@"table width more" context:NULL];
diff -r c76c895825ab -r d87619de120d project_files/HedgewarsMobile/Resources/MainMenuViewController-iPhone.xib
--- a/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPhone.xib Fri Oct 29 00:25:18 2010 +0200
+++ b/project_files/HedgewarsMobile/Resources/MainMenuViewController-iPhone.xib Fri Oct 29 01:28:15 2010 +0200
@@ -12,7 +12,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="22"/>
+ <integer value="1"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -74,10 +74,40 @@
<string key="NSResourceName">title_small.png</string>
</object>
</object>
+ <object class="IBUIImageView" id="936485487">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">266</int>
+ <string key="NSFrame">{{0, 297}, {480, 23}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <int key="IBUIContentMode">4</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <object class="NSCustomResource" key="IBUIImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">borderBottom.png</string>
+ </object>
+ </object>
+ <object class="IBUIImageView" id="821240857">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">290</int>
+ <string key="NSFrameSize">{480, 17}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <int key="IBUIContentMode">4</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <object class="NSCustomResource" key="IBUIImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">borderTop.png</string>
+ </object>
+ </object>
<object class="IBUIButton" id="124270424">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">289</int>
- <string key="NSFrame">{{130, 166}, {220, 52}}</string>
+ <string key="NSFrame">{{130, 178}, {220, 52}}</string>
<reference key="NSSuperview" ref="191373211"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
@@ -156,40 +186,10 @@
<string key="NSResourceName">savesButton.png</string>
</object>
</object>
- <object class="IBUIImageView" id="821240857">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">290</int>
- <string key="NSFrameSize">{480, 17}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <int key="IBUIContentMode">4</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <object class="NSCustomResource" key="IBUIImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">borderTop.png</string>
- </object>
- </object>
- <object class="IBUIImageView" id="936485487">
- <reference key="NSNextResponder" ref="191373211"/>
- <int key="NSvFlags">266</int>
- <string key="NSFrame">{{0, 297}, {480, 23}}</string>
- <reference key="NSSuperview" ref="191373211"/>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <int key="IBUIContentMode">4</int>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <object class="NSCustomResource" key="IBUIImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">borderBottom.png</string>
- </object>
- </object>
<object class="IBUIButton" id="818907840">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{0, 20}, {18, 19}}</string>
+ <string key="NSFrame">{{231, 111}, {18, 19}}</string>
<reference key="NSSuperview" ref="191373211"/>
<bool key="IBUIOpaque">NO</bool>
<float key="IBUIAlpha">0.5</float>
@@ -283,13 +283,13 @@
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="249993817"/>
- <reference ref="821240857"/>
- <reference ref="936485487"/>
<reference ref="171108356"/>
+ <reference ref="753723574"/>
+ <reference ref="705508539"/>
<reference ref="124270424"/>
- <reference ref="753723574"/>
<reference ref="818907840"/>
- <reference ref="705508539"/>
+ <reference ref="936485487"/>
+ <reference ref="821240857"/>
</object>
<reference key="parent" ref="0"/>
</object>
@@ -362,7 +362,9 @@
<string>28.IBPluginDependency</string>
<string>28.IBViewBoundsToFrameTransform</string>
<string>35.IBPluginDependency</string>
+ <string>35.IBViewBoundsToFrameTransform</string>
<string>36.IBPluginDependency</string>
+ <string>36.IBViewBoundsToFrameTransform</string>
<string>41.IBPluginDependency</string>
<string>41.IBViewBoundsToFrameTransform</string>
<string>43.IBPluginDependency</string>
@@ -372,7 +374,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>MainMenuViewController</string>
<string>UIResponder</string>
- <string>{{432, 461}, {480, 320}}</string>
+ <string>{{478, 779}, {480, 320}}</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -381,17 +383,21 @@
</object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABC7AAAw0gAAA</bytes>
+ <bytes key="NSTransformStruct">P4AAAL+AAABDAgAAw1gAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">AUPIgABDdwAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform"/>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">
- <bytes key="NSTransformStruct">P4AAAL+AAABBoAAAw4+AAA</bytes>
+ <bytes key="NSTransformStruct">AQAAAABDlIAAA</bytes>
+ </object>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDZwAAwwcAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<object class="NSAffineTransform">