mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-30 16:22:39 +00:00
-> Reduce the rageshake timeout
-> apply screen scale to the screenshot (avoid having ugly ones on iphone 6+)
This commit is contained in:
parent
e3fb0017b9
commit
363a0bbd25
1 changed files with 6 additions and 2 deletions
|
@ -78,7 +78,7 @@ static RageShakableUIResponder* sharedInstance = nil;
|
|||
|
||||
RageShakableUIResponder* rageShakableUIResponder = [responder isKindOfClass:[RageShakableUIResponder class]] ? (RageShakableUIResponder*)responder : sharedInstance;
|
||||
|
||||
if (rageShakableUIResponder && [AppDelegate theDelegate].isAppForeground && (([[NSDate date] timeIntervalSince1970] - rageShakableUIResponder->startShakingTimeStamp) > 1.5) && !rageShakableUIResponder->confirmationAlert) {
|
||||
if (rageShakableUIResponder && [AppDelegate theDelegate].isAppForeground && (([[NSDate date] timeIntervalSince1970] - rageShakableUIResponder->startShakingTimeStamp) > 1) && !rageShakableUIResponder->confirmationAlert) {
|
||||
if (!rageShakableUIResponder->ignoreShakeEnd) {
|
||||
rageShakableUIResponder->startShakingTimeStamp = [[NSDate date] timeIntervalSince1970];
|
||||
|
||||
|
@ -127,8 +127,9 @@ static RageShakableUIResponder* sharedInstance = nil;
|
|||
}
|
||||
|
||||
+ (void)takeScreenshot:(UIViewController*)controller {
|
||||
|
||||
AppDelegate* theDelegate = [AppDelegate theDelegate];
|
||||
UIGraphicsBeginImageContext(theDelegate.window.bounds.size);
|
||||
UIGraphicsBeginImageContextWithOptions(theDelegate.window.bounds.size, NO, [UIScreen mainScreen].scale);
|
||||
|
||||
// Iterate over every window from back to front
|
||||
for (UIWindow *window in [[UIApplication sharedApplication] windows])
|
||||
|
@ -161,6 +162,9 @@ static RageShakableUIResponder* sharedInstance = nil;
|
|||
[UIPasteboard generalPasteboard].image = image;
|
||||
|
||||
if (controller) {
|
||||
|
||||
[controller.view snapshotViewAfterScreenUpdates:YES];
|
||||
|
||||
sharedInstance->parentViewController = controller;
|
||||
sharedInstance->mailComposer = [[MFMailComposeViewController alloc] init];
|
||||
|
||||
|
|
Loading…
Reference in a new issue