[TIMOB-11876] Support for custom shadow image of nav bar #4750
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -272,14 +272,6 @@ -(BOOL)_handleClose:(id)args | |
| -(void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration | ||
| { | ||
| [super willAnimateRotationToInterfaceOrientation:toInterfaceOrientation duration:duration]; | ||
| [self willChangeSize]; | ||
| } | ||
|
|
||
|
|
@@ -379,39 +371,65 @@ -(void)setBarColor:(id)colorString | |
| } | ||
| } | ||
|
|
||
|
|
||
|
|
||
| -(void)updateBarImage | ||
| { | ||
| if (controller == nil || [controller navigationController] == nil || !shouldUpdateNavBar) { | ||
| return; | ||
| } | ||
|
|
||
| id barImageValue = [self valueForUndefinedKey:@"barImage"]; | ||
|
|
||
| UINavigationBar* ourNB = [[controller navigationController] navigationBar]; | ||
| UIImage* theImage = [TiUtils toImage:barImageValue proxy:self]; | ||
|
|
||
| if (theImage == nil) { | ||
| [ourNB setBackgroundImage:nil forBarMetrics:UIBarMetricsDefault]; | ||
| } else { | ||
| UIImage* resizableImage = [theImage resizableImageWithCapInsets:UIEdgeInsetsMake(0, 0, 0, 0) resizingMode:UIImageResizingModeStretch]; | ||
| [ourNB setBackgroundImage:resizableImage forBarMetrics:UIBarMetricsDefault]; | ||
| //You can only set up the shadow image with a custom background image. | ||
| id shadowImageValue = [self valueForUndefinedKey:@"shadowImage"]; | ||
| theImage = [TiUtils toImage:shadowImageValue proxy:self]; | ||
|
|
||
| if (theImage != nil) { | ||
| UIImage* resizableImage = [theImage resizableImageWithCapInsets:UIEdgeInsetsMake(0, 0, 0, 0) resizingMode:UIImageResizingModeStretch]; | ||
|
There was a problem hiding this comment.
There was a problem hiding this comment. @philet as of 3.1.3 Titanium SDK only supports iOS SDK 6.0 and above, so these changes are fine. |
||
| ourNB.shadowImage = resizableImage; | ||
| } else { | ||
| BOOL clipValue = [TiUtils boolValue:[self valueForUndefinedKey:@"hideShadow"] def:NO]; | ||
| if (clipValue) { | ||
| //Set an empty Image. | ||
| ourNB.shadowImage = [[[UIImage alloc] init] autorelease]; | ||
| } else { | ||
| ourNB.shadowImage = nil; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } | ||
|
|
||
| -(void)setBarImage:(id)value | ||
| { | ||
| [self replaceValue:value forKey:@"barImage" notification:NO]; | ||
| if (controller!=nil) | ||
| { | ||
| TiThreadPerformOnMainThread(^{[self updateBarImage];}, NO); | ||
| } | ||
| } | ||
|
|
||
| -(void)setShadowImage:(id)value | ||
| { | ||
| [self replaceValue:value forKey:@"shadowImage" notification:NO]; | ||
| if (controller!=nil) | ||
| { | ||
| TiThreadPerformOnMainThread(^{[self updateBarImage];}, NO); | ||
| } | ||
| } | ||
|
|
||
| -(void)setHideShadow:(id)value | ||
| { | ||
| [self replaceValue:value forKey:@"hideShadow" notification:NO]; | ||
| if (controller!=nil) | ||
| { | ||
| TiThreadPerformOnMainThread(^{[self updateBarImage];}, NO); | ||
|
|
@@ -458,8 +476,7 @@ -(void)setRightNavButton:(id)proxy withObject:(id)properties | |
| // add the new one | ||
| BOOL animated = [TiUtils boolValue:@"animated" properties:properties def:NO]; | ||
| [controller.navigationItem setRightBarButtonItem:[proxy barButtonItem] animated:animated]; | ||
| } | ||
| else | ||
| { | ||
| controller.navigationItem.rightBarButtonItem = nil; | ||
|
|
@@ -506,8 +523,7 @@ -(void)setLeftNavButton:(id)proxy withObject:(id)properties | |
| // add the new one | ||
| BOOL animated = [TiUtils boolValue:@"animated" properties:properties def:NO]; | ||
| [controller.navigationItem setLeftBarButtonItem:[proxy barButtonItem] animated:animated]; | ||
| } | ||
| else | ||
| { | ||
| controller.navigationItem.leftBarButtonItem = nil; | ||
|
|
@@ -583,7 +599,6 @@ -(void)refreshBackButton | |
| } | ||
| [[prevController navigationItem] setBackBarButtonItem:backButton]; | ||
| [backButton release]; | ||
| } | ||
|
|
||
| -(void)setBackButtonTitle:(id)proxy | ||
|
|
@@ -619,10 +634,6 @@ -(void)updateNavBar | |
| if ([[self valueForKey:@"titleControl"] isKindOfClass:[TiViewProxy class]]) { | ||
| [self updateTitleView]; | ||
| } | ||
| }, NO); | ||
| } | ||
|
|
||
|
|
@@ -664,8 +675,6 @@ -(void)updateTitleView | |
| //layout the titleControl children | ||
| [titleControl layoutChildren:NO]; | ||
|
|
||
| return; | ||
| } | ||
| [oldProxy removeBarButtonView]; | ||
|
|
@@ -689,7 +698,6 @@ -(void)updateTitleView | |
| if (oldView != newTitleView) { | ||
| [ourNavItem setTitleView:newTitleView]; | ||
| } | ||
| } | ||
|
|
||
|
|
||
|
|
@@ -862,7 +870,7 @@ -(void)setupWindowDecorations | |
| SETPROPOBJ(@"leftNavButton",setLeftNavButton); | ||
| SETPROPOBJ(@"rightNavButton",setRightNavButton); | ||
| SETPROPOBJ(@"toolbar",setToolbar); | ||
| [self updateBarImage]; | ||
| [self refreshBackButton]; | ||
|
|
||
| id navBarHidden = [self valueForKey:@"navBarHidden"]; | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
resizableImageWithCapInsets:resizingMode:is available only as from iOS6Should fall back to
resizableImageWithCapInsets:for iOS5