From d0bdcb8765f96405a150cc674438205582895b0a Mon Sep 17 00:00:00 2001 From: Stephan Toggweiler Date: Sat, 23 Mar 2013 19:54:19 +0100 Subject: [PATCH] more clear now --- lib/ProMotion/screen_helpers/screen_tabs.rb | 5 ++--- lib/ProMotion/screens/_screen_module.rb | 11 ++++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/ProMotion/screen_helpers/screen_tabs.rb b/lib/ProMotion/screen_helpers/screen_tabs.rb index d0433f9..bfb7c3a 100644 --- a/lib/ProMotion/screen_helpers/screen_tabs.rb +++ b/lib/ProMotion/screen_helpers/screen_tabs.rb @@ -44,9 +44,8 @@ module ProMotion end split = SplitViewController.alloc.init split.delegate=args[:screen2] - args[:screen1].view_screen=split - #args[:screen2].parent_screen=args[:screen1] - split.tabBarItem=create_tab_bar_item(title: args[:title]) + args[:screen1].split_screen=split + split.tabBarItem=create_tab_bar_icon_custom(args[:title], args[:icon], 0) scr=[] [args[:screen1], args[:screen2]].each do |s| if s.navigation_controller diff --git a/lib/ProMotion/screens/_screen_module.rb b/lib/ProMotion/screens/_screen_module.rb index eb9f8c2..f365d45 100644 --- a/lib/ProMotion/screens/_screen_module.rb +++ b/lib/ProMotion/screens/_screen_module.rb @@ -5,7 +5,7 @@ module ProMotion include ProMotion::SystemHelper include ProMotion::ScreenTabs - attr_accessor :parent_screen, :first_screen, :tab_bar_item, :tab_bar, :modal + attr_accessor :parent_screen, :first_screen, :tab_bar_item, :tab_bar, :modal, :split_screen def on_create(args = {}) unless self.is_a?(UIViewController) @@ -26,6 +26,15 @@ module ProMotion self.modal == true end + def is_split_screen? + self.split_screen.nil? != true + end + + def open_in_split_screen(screen) + a=[self.split_screen.viewControllers[0], screen.main_controller] + self.split_screen.viewControllers=a + end + def has_nav_bar? self.navigation_controller.nil? != true end