commit 89398b6387bb9f647f22edda1e854ef85009f379
author Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> Tue Nov 20 16:45:04 2018 -0500
committer Andreas Traczyk <andreas.traczyk@savoirfairelinux.com> Wed Nov 21 18:20:24 2018 -0400
tree 05b697a96efa1f2e1919ba01e57d2267d5501583
parent 91c179988eefd8e8a02fe7bc8dedab9dbc5d07e7

UI: call view border

Hide split view divider and remove blur border on call view.

Change-Id: I3422b98cd7d02508d2e314d07884ebf17a28fc4d
Reviewed-by: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>

src/CurrentCallVC.mm

diff --git a/src/CurrentCallVC.mm b/src/CurrentCallVC.mm
index d2dd465..9493487 100644
--- a/src/CurrentCallVC.mm
+++ b/src/CurrentCallVC.mm
@@ -69,7 +69,7 @@
 
 // Main container
 @property (unsafe_unretained) IBOutlet NSSplitView* splitView;
-@property (unsafe_unretained) IBOutlet NSImageView* backgroundImage;
+@property (unsafe_unretained) IBOutlet NSView* backgroundImage;
 @property (unsafe_unretained) IBOutlet NSBox* bluerBackgroundEffect;
 
 // Header info
@@ -201,6 +201,8 @@
     bluerBackgroundEffect.alphaValue = 0.6;
     [audioCallView setWantsLayer:YES];
     [audioCallView.layer setBackgroundColor: [[NSColor clearColor] CGColor]];
+    [backgroundImage setWantsLayer: YES];
+    backgroundImage.layer.contentsGravity = kCAGravityResizeAspectFill;
 }
 
 -(void) updateDurationLabel
@@ -332,7 +334,6 @@
     [headerContainer setHidden:NO];
     [previewView setHidden: NO];
     [bluerBackgroundEffect setHidden:YES];
-    [bluerBackgroundEffect.layer setBackgroundFilters: nil];
     [backgroundImage setHidden:YES];
 }
 
@@ -347,17 +348,24 @@
     auto it = getConversationFromUid(convUid_, *convModel);
     NSImage *image= [self getContactImageOfSize:120.0 withDefaultAvatar:NO];
     if(image) {
+        CIImage * ciImage = [[CIImage alloc] initWithData:[image TIFFRepresentation]];
+        CIContext *context = [[CIContext alloc] init];
+        CIFilter *clamp = [CIFilter filterWithName:@"CIAffineClamp"];
+        [clamp setValue:[NSAffineTransform transform] forKey:@"inputTransform"];
+        [clamp setValue:ciImage forKey: kCIInputImageKey];
         CIFilter* bluerFilter = [CIFilter filterWithName:@"CIGaussianBlur"];
         [bluerFilter setDefaults];
-        [bluerFilter setValue:[NSNumber numberWithFloat: 30] forKey:@"inputRadius"];
-        [bluerBackgroundEffect.layer setBackgroundFilters:@[bluerFilter]];
-        [backgroundImage setImage: image];
+        [bluerFilter setValue:[NSNumber numberWithFloat: 9] forKey:@"inputRadius"];
+        [bluerFilter setValue:[clamp valueForKey:kCIOutputImageKey] forKey: kCIInputImageKey];
+        CIImage *result = [bluerFilter valueForKey:kCIOutputImageKey];
+        CGRect extent = [result extent];
+        CGImageRef cgImage = [context createCGImage:result fromRect: [ciImage extent]];
+        NSImage *bluredImage = [[NSImage alloc] initWithCGImage:cgImage size:NSSizeFromCGSize(CGSizeMake(image.size.width, image.size.height))];
+        backgroundImage.layer.contents = bluredImage;
         [backgroundImage setHidden:NO];
     } else {
-        [bluerBackgroundEffect.layer setBackgroundFilters:nil];
         [bluerBackgroundEffect setFillColor:[NSColor ringDarkGrey]];
         [backgroundImage setHidden:YES];
-        [backgroundImage setImage:nil];
     }
 }
 
@@ -653,8 +661,6 @@
     //background view
     [bluerBackgroundEffect setHidden:NO];
     [backgroundImage setHidden:NO];
-    [backgroundImage setImage:nil];
-    [bluerBackgroundEffect setBackgroundFilters:nil];
     //outgoing view
     [outgoingPersonLabel setStringValue:@""];
     [outgoingStateLabel setStringValue:@""];
@@ -1004,4 +1010,9 @@
     [[headerContainer animator] setAlphaValue:move];
 }
 
+- (BOOL)splitView:(NSSplitView *)splitView shouldHideDividerAtIndex:(NSInteger)dividerIndex
+{
+    return YES;
+}
+
 @end