Skip to content

Commit

Permalink
Merge branch 'fix-ttnavigator-tabbar' of https://github.com/cemaleker…
Browse files Browse the repository at this point in the history
…/three20 into cemaleker-fix-ttnavigator-tabbar
  • Loading branch information
jwang committed Jul 28, 2011
2 parents d230fb6 + 48a12ff commit 8f30e16
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/Three20UI/Sources/UITabBarControllerAdditions.m
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,12 @@ - (BOOL)canContainControllers {

///////////////////////////////////////////////////////////////////////////////////////////////////
- (UIViewController*)topSubcontroller {
return self.selectedViewController;
if (self.tabBar.selectedItem == self.moreNavigationController.tabBarItem) {
return self.moreNavigationController;
}
else {
return self.selectedViewController;
}
}


Expand Down

0 comments on commit 8f30e16

Please sign in to comment.