Merge branch 'release/2.0.1'

lanayotech · Sep 4, 2014 · a47d3cd · a47d3cd
2 parents 7ca6422 + d84387e
commit a47d3cd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/Vagrant Manager/AXStatusItemPopup/AXStatusItemPopup.m b/Vagrant Manager/AXStatusItemPopup/AXStatusItemPopup.m
@@ -87,7 +87,6 @@ - (void)setTitle:(NSString*)title {
     NSAttributedString *string = [[NSAttributedString alloc] initWithString:title attributes:@{NSFontAttributeName: _titleView.font}];
     CGRect rect = [string boundingRectWithSize:(CGSize){CGFLOAT_MAX, self.frame.size.height} options:NSStringDrawingUsesLineFragmentOrigin];
 
-
     CGRect frame = _titleView.frame;
     frame.size.width = rect.size.width;
     frame.size.height = rect.size.height;
@@ -111,16 +110,6 @@ - (void)drawRect:(NSRect)dirtyRect
         [[NSColor clearColor] setFill];
     }
     NSRectFill(dirtyRect);
-
-    // set image
-    NSImage *image = (_active ? _alternateImage : _image);
-    _imageView.image = image;
-
-    if(_active) {
-        _titleView.textColor = [NSColor whiteColor];
-    } else {
-        _titleView.textColor = [NSColor blackColor];
-    }
 }
 
 ////////////////////////////////////
@@ -152,12 +141,19 @@ - (void)mouseDown:(NSEvent *)theEvent
 - (void)setActive:(BOOL)active
 {
     _active = active;
+
+    _imageView.image = (_active ? _alternateImage : _image);
+    _titleView.textColor = (_active ? [NSColor whiteColor] : [NSColor blackColor]);
+
     [self setNeedsDisplay:YES];
 }
 
 - (void)setImage:(NSImage *)image
 {
     _image = image;
+
+    _imageView.image = (_active && _alternateImage ? _alternateImage : _image);
+
     [self updateViewFrame];
 }
 
@@ -167,6 +163,9 @@ - (void)setAlternateImage:(NSImage *)image
     if (!image && _image) {
         _alternateImage = _image;
     }
+
+    _imageView.image = (_active && _alternateImage ? _alternateImage : _image);
+
     [self updateViewFrame];
 }
 

diff --git a/Vagrant Manager/Vagrant Manager-Info.plist b/Vagrant Manager/Vagrant Manager-Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0</string>
+	<string>2.0.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.0</string>
+	<string>2.0.1</string>
 	<key>Configuration</key>
 	<string>${CONFIGURATION}</string>
 	<key>LSApplicationCategoryType</key>