Skip to content
This repository was archived by the owner on Feb 5, 2025. It is now read-only.

Make Windows taskbar menu ordering more consistent with other programs #1

Open
dstjacques wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make Windows taskbar menu ordering more consistent with other programs #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e279c05
Move the window control options to the bottom of the system and conte…
dstjacques Jun 15, 2011
6788daf
Remove the extra separator at the top of the context/system menus and…
dstjacques Jun 16, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions windows/window.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)

popup_menus[SYSMENU].menu = GetSystemMenu(hwnd, FALSE);
popup_menus[CTXMENU].menu = CreatePopupMenu();
AppendMenu(popup_menus[CTXMENU].menu, MF_ENABLED, IDM_PASTE, "&Paste");
InsertMenu(popup_menus[CTXMENU].menu, SC_RESTORE, MF_ENABLED, IDM_PASTE, "&Paste");

savedsess_menu = CreateMenu();
get_sesslist(&sesslist, TRUE);
Expand All @@ -771,26 +771,26 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
for (j = 0; j < lenof(popup_menus); j++) {
m = popup_menus[j].menu;

AppendMenu(m, MF_SEPARATOR, 0, 0);
AppendMenu(m, MF_ENABLED, IDM_SHOWLOG, "&Event Log");
AppendMenu(m, MF_SEPARATOR, 0, 0);
AppendMenu(m, MF_ENABLED, IDM_NEWSESS, "Ne&w Session...");
AppendMenu(m, MF_ENABLED, IDM_DUPSESS, "&Duplicate Session");
AppendMenu(m, MF_POPUP | MF_ENABLED, (UINT) savedsess_menu,
InsertMenu(m, SC_RESTORE, MF_ENABLED, IDM_SHOWLOG, "&Event Log");
InsertMenu(m, SC_RESTORE, MF_SEPARATOR, 0, 0);
InsertMenu(m, SC_RESTORE, MF_ENABLED, IDM_NEWSESS, "Ne&w Session...");
InsertMenu(m, SC_RESTORE, MF_ENABLED, IDM_DUPSESS, "&Duplicate Session");
InsertMenu(m, SC_RESTORE, MF_POPUP | MF_ENABLED, (UINT) savedsess_menu,
"Sa&ved Sessions");
AppendMenu(m, MF_ENABLED, IDM_RECONF, "Chan&ge Settings...");
AppendMenu(m, MF_SEPARATOR, 0, 0);
AppendMenu(m, MF_ENABLED, IDM_COPYALL, "C&opy All to Clipboard");
AppendMenu(m, MF_ENABLED, IDM_CLRSB, "C&lear Scrollback");
AppendMenu(m, MF_ENABLED, IDM_RESET, "Rese&t Terminal");
AppendMenu(m, MF_SEPARATOR, 0, 0);
AppendMenu(m, (cfg.resize_action == RESIZE_DISABLED) ?
InsertMenu(m, SC_RESTORE, MF_ENABLED, IDM_RECONF, "Chan&ge Settings...");
InsertMenu(m, SC_RESTORE, MF_SEPARATOR, 0, 0);
InsertMenu(m, SC_RESTORE, MF_ENABLED, IDM_COPYALL, "C&opy All to Clipboard");
InsertMenu(m, SC_RESTORE, MF_ENABLED, IDM_CLRSB, "C&lear Scrollback");
InsertMenu(m, SC_RESTORE, MF_ENABLED, IDM_RESET, "Rese&t Terminal");
InsertMenu(m, SC_RESTORE, MF_SEPARATOR, 0, 0);
InsertMenu(m, SC_RESTORE, (cfg.resize_action == RESIZE_DISABLED) ?
MF_GRAYED : MF_ENABLED, IDM_FULLSCREEN, "&Full Screen");
AppendMenu(m, MF_SEPARATOR, 0, 0);
InsertMenu(m, SC_RESTORE, MF_SEPARATOR, 0, 0);
if (has_help())
AppendMenu(m, MF_ENABLED, IDM_HELP, "&Help");
InsertMenu(m, SC_RESTORE, MF_ENABLED, IDM_HELP, "&Help");
str = dupprintf("&About %s", appname);
AppendMenu(m, MF_ENABLED, IDM_ABOUT, str);
InsertMenu(m, SC_RESTORE, MF_ENABLED, IDM_ABOUT, str);
InsertMenu(m, SC_RESTORE, MF_SEPARATOR, 0, 0);
sfree(str);
}
}
Expand Down