moparisthebest/FireTray
1
0
Fork 0
mirror of https://github.com/moparisthebest/FireTray synced 2024-08-13 15:53:47 -04:00
Code Issues Releases Wiki Activity

Fix popup menu separator placing.

Browse Source
This commit is contained in:
foudfou 2014-04-02 22:49:10 +02:00
parent ad5a1a5941
commit 46ceaec9d0
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/modules/winnt/FiretrayPopupMenu.jsm
View File

@ -49,30 +49,25 @@ firetray.PopupMenu = {
this.menu = user32.CreatePopupMenu(); // FIXME: destroy this.menu = user32.CreatePopupMenu(); // FIXME: destroy
log.debug("menu="+this.menu); log.debug("menu="+this.menu);
var addMenuSeparator = false;
this.insertMenuItem('Quit', 'quit', IDM_QUIT); this.insertMenuItem('Quit', 'quit', IDM_QUIT);
user32.InsertMenuW(this.menu, 0, user32.MF_BYPOSITION|user32.MF_SEPARATOR, 0, null); user32.InsertMenuW(this.menu, 0, user32.MF_BYPOSITION|user32.MF_SEPARATOR, 0, null);
this.insertMenuItem('Preferences', 'prefs', IDM_PREF); this.insertMenuItem('Preferences', 'prefs', IDM_PREF);
let menuSeparatorAdded = false;
if (firetray.Handler.inBrowserApp) { if (firetray.Handler.inBrowserApp) {
user32.InsertMenuW(this.menu, 0, user32.MF_BYPOSITION|user32.MF_SEPARATOR, 0, null);
menuSeparatorAdded = true;
this.insertMenuItem('NewWindow', 'new-wnd', IDM_NEW_WND); this.insertMenuItem('NewWindow', 'new-wnd', IDM_NEW_WND);
addMenuSeparator = true;
} }
if (firetray.Handler.inMailApp) { if (firetray.Handler.inMailApp) {
if (!menuSeparatorAdded) {
user32.InsertMenuW(this.menu, 0, user32.MF_BYPOSITION|user32.MF_SEPARATOR, 0, null);
}
this.insertMenuItem('NewMessage', 'new-msg', IDM_NEW_MSG); this.insertMenuItem('NewMessage', 'new-msg', IDM_NEW_MSG);
this.insertMenuItem('ResetIcon', 'reset', IDM_RESET); this.insertMenuItem('ResetIcon', 'reset', IDM_RESET);
addMenuSeparator = true;
} }
if (addMenuSeparator) {
user32.InsertMenuW(this.menu, 2, user32.MF_BYPOSITION|user32.MF_SEPARATOR, 0, null);
}
// // We'll user InsertMenuW for hidden windows:
// user32.InsertMenuW(this.menu, 0, user32.MF_BYPOSITION|user32.MF_STRING, IDM_CLOSE, "Close"); // FIXME: ampersand doesn't work ?
log.debug("PopupMenu created"); log.debug("PopupMenu created");
}, },