Merge pull request nwjs#2839 from mrfabbri/fix-tray-icon-title-osx

rogerwang · rogerwang · commit fbefe51ee621 · 2014-12-20T21:48:36.000+08:00
Fix tray title/tooltip issues on Mac OS X
diff --git a/src/api/tray/tray.cc b/src/api/tray/tray.cc
@@ -51,7 +51,7 @@ Tray::Tray(int id,
 
   std::string tooltip;
   if (option.GetString("tooltip", &tooltip))
-    SetTitle(tooltip);
+    SetTooltip(tooltip);
 
   int menu_id;
   if (option.GetInteger("menu", &menu_id))
diff --git a/src/api/tray/tray.h b/src/api/tray/tray.h
@@ -64,7 +64,7 @@ class Tray : public Base {
   void Destroy();
   void SetTitle(const std::string& title);
   void SetIcon(const std::string& icon_path);
-  void SetTooltip(const std::string& title);
+  void SetTooltip(const std::string& tooltip);
   void SetMenu(Menu* menu);
   void Remove();
   // Alternate icons only work with Macs
diff --git a/src/api/tray/tray_mac.mm b/src/api/tray/tray_mac.mm
@@ -75,6 +75,11 @@ - (void)onClick:(id)sender {
 }
 
 void Tray::SetTitle(const std::string& title) {
+  // note: this is kind of mad but the first time we set the title property 
+  // we have to call setTitle twice or it won't get the right dimensions
+  if ([status_item_ title] != nil) {
+    [status_item_ setTitle:[NSString stringWithUTF8String:title.c_str()]];
+  }
   [status_item_ setTitle:[NSString stringWithUTF8String:title.c_str()]];
 }
 

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,11 @@ - (void)onClick:(id)sender {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`void Tray::SetTitle(const std::string& title) {`
	`78`	`+ // note: this is kind of mad but the first time we set the title property`
	`79`	`+ // we have to call setTitle twice or it won't get the right dimensions`
	`80`	`+ if ([status_item_ title] != nil) {`
	`81`	`+ [status_item_ setTitle:[NSString stringWithUTF8String:title.c_str()]];`
	`82`	`+ }`
`78`	`83`	`[status_item_ setTitle:[NSString stringWithUTF8String:title.c_str()]];`
`79`	`84`	`}`
`80`	`85`