commit 88a6ee8267a29b86f43b0f7a11cfdbbcfa466f3b
author Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> Tue Sep 10 17:55:08 2019 -0400
committer Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> Fri Sep 27 10:01:47 2019 -0400
tree 54a9e19c3fe0a51f0a4a04c93aa26dc9e7a877a3
parent 4e11f068f85353b898ac2b26ad38e013f3a60092

callView: update buttons

Change-Id: I6b13436d2f4f1181a3bcd865f0206b1cd5d2a3fa

src/views/HoverButton.mm

diff --git a/src/views/HoverButton.mm b/src/views/HoverButton.mm
index ea04281..c0e8dd5 100644
--- a/src/views/HoverButton.mm
+++ b/src/views/HoverButton.mm
@@ -21,7 +21,6 @@
 #import "NSColor+RingTheme.h"
 
 @implementation HoverButton
-
 -(void) awakeFromNib {
     [super awakeFromNib];
     if(!self.hoverColor) {
@@ -31,6 +30,9 @@
         self.mouseOutsideColor = [NSColor clearColor];
     }
     self.bgColor = self.mouseOutsideColor;
+    if(self.moiuseOutsideImageColor) {
+        self.imageColor = self.moiuseOutsideImageColor;
+    }
 }
 
 -(instancetype)initWithFrame:(NSRect)frameRect {
@@ -42,23 +44,57 @@
         self.mouseOutsideColor = [NSColor clearColor];
     }
     self.bgColor = self.mouseOutsideColor;
+    if(self.moiuseOutsideImageColor) {
+        self.imageColor = self.moiuseOutsideImageColor;
+    }
     return self;
 }
 
 -(void)mouseEntered:(NSEvent *)theEvent {
+    if (self.animating) {
+        [self stopBlinkAnimation];
+        self.animating = true;
+    }
     if(self.isEnabled) {
         self.bgColor = self.hoverColor;
     }
+    if(self.imageHoverColor) {
+        self.imageColor = self.imageHoverColor;
+    }
+    if (self.imageIncreaseOnHover) {
+        self.imageInsets -= self.imageIncreaseOnHover;
+    }
     [super setNeedsDisplay:YES];
     [super mouseEntered:theEvent];
 }
 
 -(void)mouseExited:(NSEvent *)theEvent {
     self.bgColor = self.mouseOutsideColor;
+    if (self.animating) {
+        [self startBlinkAnimationfrom:[NSColor buttonBlinkColorColor] to:[NSColor whiteColor] scaleFactor: 1.0 duration: 1.5];
+    }
+    if(self.imagePressedColor && self.pressed) {
+        self.imageColor = self.imagePressedColor;
+    } else if ( self.moiuseOutsideImageColor) {
+        self.imageColor = self.moiuseOutsideImageColor;
+    }
+    if (self.imageIncreaseOnHover) {
+        self.imageInsets += self.imageIncreaseOnHover;
+    }
     [super setNeedsDisplay:YES];
     [super mouseExited:theEvent];
 }
 
+-(void) setPressed:(BOOL)newVal
+{
+    if(self.imagePressedColor && newVal) {
+        self.imageColor = self.imagePressedColor;
+    } else if ( self.moiuseOutsideImageColor) {
+        self.imageColor = self.moiuseOutsideImageColor;
+    }
+    [super setPressed:newVal];
+}
+
 - (void)ensureTrackingArea {
     if (trackingArea == nil) {
         trackingArea = [[NSTrackingArea alloc] initWithRect:NSZeroRect