commit 0c9ab7ce34efda4c289879948e67610819abde50
author Ilya Moiseenko <iliamo@ucla.edu> Tue Oct 29 15:08:23 2013 -0700
committer Ilya Moiseenko <iliamo@ucla.edu> Tue Oct 29 15:22:53 2013 -0700
tree 105396b9e60d876799866aac5cd6a50cb4987548
parent 1d794cefc0a9c4f322d79c9e8c4b57eed079ff66

UI improvements

Change-Id: I8b3540f8a49c6a151d5cc54d9a49005e0a3c98d8

osx/menu-delegate.mm

diff --git a/osx/menu-delegate.mm b/osx/menu-delegate.mm
index 34ef2d0..eac903b 100644
--- a/osx/menu-delegate.mm
+++ b/osx/menu-delegate.mm
@@ -9,6 +9,7 @@
 #include "config.h"
 #import "menu-delegate.h"
 #import "ndnd-status-operation.h"
+#import "tight-menu-item-view.h"
 
 @implementation MenuDelegate
 
@@ -72,7 +73,13 @@
   [statusItem setTitle:@""];
   [statusItem setImage:m_disconnectedIcon];
   
-  [connectionStatus setView: connectionStatusView];
+  float menuItemHeight = 20;
+
+  NSRect viewRect = NSMakeRect(0, 0, /* width autoresizes */ 1, menuItemHeight);
+  connectionStatusView = [[TightMenuItemView alloc] initWithFrame:viewRect];
+  connectionStatusView.autoresizingMask = NSViewWidthSizable;
+
+  [connectionStatus setView:connectionStatusView];
   [connectionStatus setTarget:self];
   
   [daemonStatus setView: daemonStatusView];
@@ -130,22 +137,6 @@
   }
 }
 
--(void)menu:(NSMenu *)menu willHighlightItem:(NSMenuItem *)item
-{
-  if( ([item view]!=nil) && (item == daemonStatus) )
-  {
-    NSView *view = [item view];
-    
-    [statusPopover showRelativeToRect:[view bounds]
-                   ofView:view
-                   preferredEdge:NSMinXEdge];
-  }
-  else
-  {
-    [statusPopover performClose:nil];
-  }
-}
-
 -(void)onTick:(NSTimer *)timer
 {
   [self updateStatus];
@@ -170,7 +161,7 @@
 {
   if (!m_daemonStarted) {
     m_daemonStarted = true;
-    [connectionStatusText setStringValue:@"Active"];
+    [connectionStatusView setStatus:@"Active"];
     
     [statusItem setImage:m_connectedIcon];
   }
@@ -203,7 +194,7 @@
   if (m_daemonStarted) {
     m_daemonStarted = false;
     
-    [connectionStatusText setStringValue:@"Starting..."];
+    [connectionStatusView setStatus:@"Starting..."];
     
     [statusItem setImage:m_disconnectedIcon];
   }