Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-25314] : iOS camera with overlay view is zoomed #9818

Merged
merged 8 commits into from
May 23, 2018
Merged

[TIMOB-25314] : iOS camera with overlay view is zoomed #9818

Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3ae81eb
[TIMOB-25314] : iOS camera with overlay view is zoomed
vijaysingh-axway Feb 13, 2018
7b2ea05
Merge branch 'master' into TIMOB-25314
ssjsamir Feb 14, 2018
ecbed9c
Merge branch 'master' into TIMOB-25314
ssjsamir Feb 14, 2018
1ff2a17
Merge branch 'master' into TIMOB-25314
ssjsamir May 16, 2018
a484d58
Merge branch 'master' into TIMOB-25314
ssjsamir May 22, 2018
b5c0098
Merge branch 'master' into TIMOB-25314
hansemannn May 23, 2018
1be326d
Merge branch 'master' into TIMOB-25314
hansemannn May 23, 2018
5354cf7
Merge branch 'master' into TIMOB-25314
hansemannn May 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion iphone/Classes/MediaModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1670,7 +1670,7 @@ - (void)showPicker:(NSDictionary *)args isCamera:(BOOL)isCamera
if (transform != nil) {
ENSURE_TYPE(transform, Ti2DMatrix);
[picker setCameraViewTransform:[transform matrix]];
} else if (cameraView != nil && customPicker) {
} else if (cameraView != nil && customPicker && ![TiUtils boolValue:@"showControls" properties:args def:YES]) {
//No transforms in popover
CGSize screenSize = [[UIScreen mainScreen] bounds].size;
UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation];
Expand Down