浏览代码

Use a UINavigationController

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
Romain Goyet 12 年之前
父节点
当前提交
8bc0c87d64
共有 2 个文件被更改,包括 10 次插入7 次删除
  1. 1 5
      AspenProject/VLCMenuViewController.m
  2. 9 2
      AspenProject/VLCPlaylistViewController.m

+ 1 - 5
AspenProject/VLCMenuViewController.m

@@ -60,11 +60,7 @@
         [dismissButton setTitleTextAttributes:@{UITextAttributeTextShadowColor : [UIColor whiteColor], UITextAttributeTextColor : [UIColor blackColor]} forState:UIControlStateNormal];
         dismissButton.width = 80.;
 
-        self.dismissToolBar.items = @[[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil], dismissButton];
-
-        [self.dismissToolBar setBackgroundImage:[UIImage imageNamed:@"navBarBackground"] forToolbarPosition:UIToolbarPositionAny barMetrics:UIBarMetricsDefault];
-        if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
-            [self.dismissToolBar setBackgroundImage:[UIImage imageNamed:@"navBarBackgroundPhoneLandscape"] forToolbarPosition:UIToolbarPositionAny barMetrics:UIBarMetricsLandscapePhone];
+        self.navigationItem.rightBarButtonItem = dismissButton;
 
         self.scrollView.contentSize = self.view.frame.size;
     }

+ 9 - 2
AspenProject/VLCPlaylistViewController.m

@@ -276,8 +276,15 @@
 
 - (IBAction)leftButtonAction:(id)sender
 {
-    if (self.menuViewController == nil)
-        self.menuViewController = [[VLCMenuViewController alloc] initWithNibName:nil bundle:nil];
+    if (self.menuViewController == nil) {
+        VLCMenuViewController *menuViewController = [[VLCMenuViewController alloc] initWithNibName:nil bundle:nil];
+        UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:menuViewController];
+        [navigationController.navigationBar setBackgroundImage:[UIImage imageNamed:@"navBarBackground"]
+                                                 forBarMetrics:UIBarMetricsDefault];
+        [navigationController.navigationBar setBackgroundImage:[UIImage imageNamed:@"navBarBackgroundPhoneLandscape"]
+                                                 forBarMetrics:UIBarMetricsLandscapePhone];
+        self.menuViewController = navigationController;
+    }
 
     if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
         self.menuViewController.contentSizeForViewInPopover = self.menuViewController.view.frame.size;