From b9b7f68b40f6638b5a1fef202f482889c0a74a4f Mon Sep 17 00:00:00 2001 From: Alex Tanskanen Date: Thu, 9 Jan 2020 16:17:06 +0100 Subject: [PATCH] Remove "Dismiss menu" from context menu This was not necessary since you could use ESC key or simply just clicking outside of the context menu to close the menu. --- vncviewer/Viewport.cxx | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/vncviewer/Viewport.cxx b/vncviewer/Viewport.cxx index 618845f4..2a40d15f 100644 --- a/vncviewer/Viewport.cxx +++ b/vncviewer/Viewport.cxx @@ -105,7 +105,7 @@ static rfb::LogWriter vlog("Viewport"); enum { ID_EXIT, ID_FULLSCREEN, ID_MINIMIZE, ID_RESIZE, ID_CTRL, ID_ALT, ID_MENUKEY, ID_CTRLALTDEL, - ID_REFRESH, ID_OPTIONS, ID_INFO, ID_ABOUT, ID_DISMISS }; + ID_REFRESH, ID_OPTIONS, ID_INFO, ID_ABOUT }; // Used to detect fake input (0xaa is not a real key) #ifdef WIN32 @@ -1237,10 +1237,7 @@ void Viewport::initContextMenu() fltk_menu_add(contextMenu, p_("ContextMenu|", "Connection &info..."), 0, NULL, (void*)ID_INFO, 0); fltk_menu_add(contextMenu, p_("ContextMenu|", "About &TigerVNC viewer..."), - 0, NULL, (void*)ID_ABOUT, FL_MENU_DIVIDER); - - fltk_menu_add(contextMenu, p_("ContextMenu|", "Dismiss &menu"), - 0, NULL, (void*)ID_DISMISS, 0); + 0, NULL, (void*)ID_ABOUT, 0); } @@ -1335,9 +1332,6 @@ void Viewport::popupContextMenu() case ID_ABOUT: about_vncviewer(); break; - case ID_DISMISS: - // Don't need to do anything - break; } } -- 2.39.5