Work/cordova-plugin-printer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use top, left, width, height instead of bounds

Browse Source
This commit is contained in:
Sebastián Katzer 2019-02-11 18:04:35 +01:00
parent 6c91c1ac68
commit 96a88759c5
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/ios/APPPrinter.m
View File

@ -148,8 +148,7 @@
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
NSArray* bounds = settings[@"ui"][@"bounds"]; CGRect rect = [self rectFromDictionary:settings[@"ui"]];
CGRect rect = [self convertIntoRect:bounds];
[controller presentFromRect:rect [controller presentFromRect:rect
inView:self.webView inView:self.webView
@ -281,8 +280,7 @@
withSettings:(NSDictionary *)settings withSettings:(NSDictionary *)settings
{ {
NSString* callbackId = settings[@"callbackId"]; NSString* callbackId = settings[@"callbackId"];
NSArray* bounds = settings[@"ui"][@"bounds"]; CGRect rect = [self rectFromDictionary:settings[@"ui"]];
CGRect rect = [self convertIntoRect:bounds];
UIPrintInteractionCompletionHandler handler = UIPrintInteractionCompletionHandler handler =
^(UIPrintInteractionController *ctrl, BOOL ok, NSError *e) { ^(UIPrintInteractionController *ctrl, BOOL ok, NSError *e) {
@ -352,16 +350,19 @@
* *
* @return A converted Rect object * @return A converted Rect object
*/ */
- (CGRect) convertIntoRect:(NSArray*)bounds - (CGRect) rectFromDictionary:(NSDictionary *)pos
{ {
if (!bounds) { CGFloat left = 40, top = 30, width = 0, height = 0;
bounds = @[@40, @30, @0, @0];
if (pos)
{
top = [pos[@"top"] floatValue];
left = [pos[@"left"] floatValue];
width = [pos[@"width"] floatValue];
height = [pos[@"height"] floatValue];
} }
return CGRectMake([bounds[0] floatValue], return CGRectMake(left, top, width, height);
[bounds[1] floatValue],
[bounds[2] floatValue],
[bounds[3] floatValue]);
} }
/** /**