From 87fdb5d0f9235aab64e26093b3d23b9a93996c73 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 8 Dec 2014 12:45:13 +0300
Subject: [PATCH] accessory in openwith width to styles

---
 Telegram/Resources/style.txt            |  2 +-
 Telegram/SourceFiles/pspecific_mac_p.mm | 28 ++++++++++++-------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/style.txt b/Telegram/Resources/style.txt
index 3ea0e50ff..4fbb25bcb 100644
--- a/Telegram/Resources/style.txt
+++ b/Telegram/Resources/style.txt
@@ -1573,7 +1573,7 @@ overviewPhotoSelectOverlay: #0a7bb03f;
 
 // Mac specific
 
-macAccessoryHeight: 90;
+macAccessory: size(450, 90);
 macEnableFilterAdd: 2;
 macEnableFilterTop: 5;
 macSelectorTop: 6;
diff --git a/Telegram/SourceFiles/pspecific_mac_p.mm b/Telegram/SourceFiles/pspecific_mac_p.mm
index 3e5ac5c4f..a25123b45 100644
--- a/Telegram/SourceFiles/pspecific_mac_p.mm
+++ b/Telegram/SourceFiles/pspecific_mac_p.mm
@@ -490,14 +490,10 @@ void objc_openFile(const QString &f, bool openwith) {
             NSArray *apps = (NSArray*)LSCopyApplicationURLsForURL(CFURLRef(url), kLSRolesAll);
             
             NSOpenPanel *openPanel = [NSOpenPanel openPanel];
-            
-            NSView *accessory = [[NSView alloc] init];
-            
-            [openPanel setAccessoryView:accessory];
-            NSRect fullRect = [[accessory superview] frame];
-            fullRect.origin = NSMakePoint(0, 0);
-            fullRect.size.height = st::macAccessoryHeight;
-            [accessory setFrame:fullRect];
+
+			NSRect fullRect = { { 0., 0. }, { st::macAccessory.width() * 1., st::macAccessory.height() * 1. } };
+			NSView *accessory = [[NSView alloc] initWithFrame:fullRect];
+			
             [accessory setAutoresizesSubviews:YES];
             
             NSPopUpButton *selector = [[NSPopUpButton alloc] init];
@@ -571,7 +567,9 @@ void objc_openFile(const QString &f, bool openwith) {
             badIconFrame.origin.y = badFrame.origin.y;
             [badLabel setFrame:badFrame];
             [badIcon setFrame:badIconFrame];
-            
+
+			[openPanel setAccessoryView:accessory];
+
             ChooseApplicationDelegate *delegate = [[ChooseApplicationDelegate alloc] init:apps withPanel:openPanel withSelector:selector withGood:goodLabel withBad:badLabel withIcon:badIcon withAccessory:accessory];
             [openPanel setDelegate:delegate];
             
@@ -594,11 +592,12 @@ void objc_openFile(const QString &f, bool openwith) {
                                                                                         (CFStringRef)ext,
                                                                                         nil);
                             for (NSString *UTI in UTIs) {
-                                LSSetDefaultRoleHandlerForContentType((CFStringRef)UTI,
-                                                                      kLSRolesEditor,
-                                                                      (CFStringRef)[[NSBundle bundleWithPath:path] bundleIdentifier]);
+								OSStatus result = LSSetDefaultRoleHandlerForContentType((CFStringRef)UTI,
+																						kLSRolesAll,
+																						(CFStringRef)[[NSBundle bundleWithPath:path] bundleIdentifier]);
+								DEBUG_LOG(("App Info: set default handler for '%1' UTI result: %2").arg([UTI cStringUsingEncoding:NSUTF8StringEncoding]).arg(result));
                             }
-                            
+
                             [UTIs release];
                         }
                         [[NSWorkspace sharedWorkspace] openFile:file withApplication:[app path]];
@@ -638,7 +637,8 @@ void objc_finish() {
 }
 
 void objc_registerCustomScheme() {
-	LSSetDefaultHandlerForURLScheme(CFSTR("tg"), (CFStringRef)[[NSBundle mainBundle] bundleIdentifier]);
+	OSStatus result = LSSetDefaultHandlerForURLScheme(CFSTR("tg"), (CFStringRef)[[NSBundle mainBundle] bundleIdentifier]);
+	DEBUG_LOG(("App Info: set default handler for 'tg' scheme result: %1").arg(result));
 }
 
 BOOL _execUpdater(BOOL update = YES) {