# 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 @@
+
+
+
+ 290
+ {480, 17}
+
+ NO
+ NO
+ 4
+ NO
+ IBCocoaTouchFramework
+
+ NSImage
+ borderTop.png
+
+
289
- {{130, 166}, {220, 52}}
+ {{130, 178}, {220, 52}}
1
@@ -156,40 +186,10 @@
savesButton.png
-
-
- 290
- {480, 17}
-
- NO
- NO
- 4
- NO
- IBCocoaTouchFramework
-
- NSImage
- borderTop.png
-
-
-
-
- 266
- {{0, 297}, {480, 23}}
-
- NO
- NO
- 4
- NO
- IBCocoaTouchFramework
-
- NSImage
- borderBottom.png
-
-
292
- {{0, 20}, {18, 19}}
+ {{231, 111}, {18, 19}}
NO
0.5
@@ -283,13 +283,13 @@
YES
-
-
+
+
-
-
+
+
@@ -362,7 +362,9 @@
28.IBPluginDependency
28.IBViewBoundsToFrameTransform
35.IBPluginDependency
+ 35.IBViewBoundsToFrameTransform
36.IBPluginDependency
+ 36.IBViewBoundsToFrameTransform
41.IBPluginDependency
41.IBViewBoundsToFrameTransform
43.IBPluginDependency
@@ -372,7 +374,7 @@
YES
MainMenuViewController
UIResponder
- {{432, 461}, {480, 320}}
+ {{478, 779}, {480, 320}}
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
@@ -381,17 +383,21 @@
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- P4AAAL+AAABC7AAAw0gAAA
+ P4AAAL+AAABDAgAAw1gAAA
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
AUPIgABDdwAAA
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
+
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- P4AAAL+AAABBoAAAw4+AAA
+ AQAAAABDlIAAA
+
+ com.apple.InterfaceBuilder.IBCocoaTouchPlugin
+
+ P4AAAL+AAABDZwAAwwcAAA
com.apple.InterfaceBuilder.IBCocoaTouchPlugin