Merge pull request #52 from starkos/flat-button-stylemaintenance-1.x

Flat button style

2 files changed, 13 insertions, 1 deletions

diff --git a/MASShortcutView.h b/MASShortcutView.h
index d6a4313..c8a46bb 100644
--- a/MASShortcutView.h
+++ b/MASShortcutView.h
@@ -5,7 +5,8 @@
 typedef enum {
     MASShortcutViewAppearanceDefault = 0,  // Height = 19 px
     MASShortcutViewAppearanceTexturedRect, // Height = 25 px
-    MASShortcutViewAppearanceRounded       // Height = 43 px
+    MASShortcutViewAppearanceRounded,      // Height = 43 px
+    MASShortcutViewAppearanceFlat
 } MASShortcutViewAppearance;
 
 @interface MASShortcutView : NSView
diff --git a/MASShortcutView.m b/MASShortcutView.m
index b2d2531..dd75729 100644
--- a/MASShortcutView.m
+++ b/MASShortcutView.m
@@ -107,6 +107,12 @@
             _shortcutCell.bezelStyle = NSRoundedBezelStyle;
             break;
         }
+        case MASShortcutViewAppearanceFlat: {
+            self.wantsLayer = YES;
+            _shortcutCell.backgroundColor = [NSColor clearColor];
+            _shortcutCell.bordered = NO;
+            break;
+        }
     }
 }
 
@@ -176,6 +182,10 @@
             [_shortcutCell drawWithFrame:CGRectOffset(frame, 0.0, 1.0) inView:self];
             break;
         }
+        case MASShortcutViewAppearanceFlat: {
+            [_shortcutCell drawWithFrame:frame inView:self];
+            break;
+        }
     }
 }
 
@@ -227,6 +237,7 @@
     switch (self.appearance) {
         case MASShortcutViewAppearanceTexturedRect: hintButtonWidth += 2.0; break;
         case MASShortcutViewAppearanceRounded: hintButtonWidth += 3.0; break;
+        case MASShortcutViewAppearanceFlat: hintButtonWidth -= 8.0 - (_shortcutCell.font.pointSize - BUTTON_FONT_SIZE); break;
         default: break;
     }
     CGRectDivide(self.bounds, &hintRect, &shortcutRect, hintButtonWidth, CGRectMaxXEdge);