Modified: trunk/Tools/ChangeLog (248398 => 248399)
--- trunk/Tools/ChangeLog 2019-08-08 00:59:57 UTC (rev 248398)
+++ trunk/Tools/ChangeLog 2019-08-08 01:34:39 UTC (rev 248399)
@@ -1,3 +1,17 @@
+2019-08-07 Fujii Hironori <[email protected]>
+
+ [Win][MiniBrowser] Add key accelerators for reload and close window
+ https://bugs.webkit.org/show_bug.cgi?id=200497
+
+ Reviewed by Brent Fulgham.
+
+ Added short cuts Ctrl-W to close window, Ctrl-R to reload.
+
+ * MiniBrowser/win/MainWindow.cpp:
+ (MainWindow::WndProc): Added IDM_CLOSE_WINDOW case.
+ * MiniBrowser/win/MiniBrowserLib.rc: Added "Close" menu item. Added accelerators.
+ * MiniBrowser/win/MiniBrowserLibResource.h: Added IDM_CLOSE_WINDOW.
+
2019-08-07 Myles C. Maxfield <[email protected]>
Add WHLSL and WebGPU to the watchlist file
Modified: trunk/Tools/MiniBrowser/win/MainWindow.cpp (248398 => 248399)
--- trunk/Tools/MiniBrowser/win/MainWindow.cpp 2019-08-08 00:59:57 UTC (rev 248398)
+++ trunk/Tools/MiniBrowser/win/MainWindow.cpp 2019-08-08 01:34:39 UTC (rev 248399)
@@ -197,6 +197,9 @@
ShowWindow(newWindow.hwnd(), SW_SHOW);
break;
}
+ case IDM_CLOSE_WINDOW:
+ PostMessage(hWnd, WM_CLOSE, 0, 0);
+ break;
case IDM_ABOUT:
DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, About);
break;
Modified: trunk/Tools/MiniBrowser/win/MiniBrowserLib.rc (248398 => 248399)
--- trunk/Tools/MiniBrowser/win/MiniBrowserLib.rc 2019-08-08 00:59:57 UTC (rev 248398)
+++ trunk/Tools/MiniBrowser/win/MiniBrowserLib.rc 2019-08-08 01:34:39 UTC (rev 248399)
@@ -46,10 +46,11 @@
MENUITEM "E&xit", IDM_EXIT
MENUITEM "New WebKit Window", IDM_NEW_WEBKIT_WINDOW
MENUITEM "New WebKitLegacy Window", IDM_NEW_WEBKITLEGACY_WINDOW
+ MENUITEM "Close\tCtrl-W", IDM_CLOSE_WINDOW
END
POPUP "&View"
BEGIN
- MENUITEM "Reload", IDM_RELOAD
+ MENUITEM "Reload\tCtrl-R", IDM_RELOAD
MENUITEM "Actual Size", IDM_ACTUAL_SIZE
MENUITEM "Zoom In\tCtrl++", IDM_ZOOM_IN
MENUITEM "Zoom Out\tCtrl+-", IDM_ZOOM_OUT
@@ -131,6 +132,8 @@
"?", IDM_ABOUT, ASCII, ALT, NOINVERT
VK_ADD, IDM_ZOOM_IN, VIRTKEY, CONTROL, NOINVERT
VK_SUBTRACT, IDM_ZOOM_OUT, VIRTKEY, CONTROL, NOINVERT
+ "W", IDM_CLOSE_WINDOW, VIRTKEY, CONTROL, NOINVERT
+ "R", IDM_RELOAD, VIRTKEY, CONTROL, NOINVERT
END
Modified: trunk/Tools/MiniBrowser/win/MiniBrowserLibResource.h (248398 => 248399)
--- trunk/Tools/MiniBrowser/win/MiniBrowserLibResource.h 2019-08-08 00:59:57 UTC (rev 248398)
+++ trunk/Tools/MiniBrowser/win/MiniBrowserLibResource.h 2019-08-08 01:34:39 UTC (rev 248399)
@@ -124,6 +124,7 @@
#define IDM_NEW_WEBKITLEGACY_WINDOW 32777
#define IDM_PROXY_SETTINGS 32778
#define IDM_RELOAD 32779
+#define IDM_CLOSE_WINDOW 32780
#define IDC_STATIC -1
// Next default values for new objects
@@ -132,7 +133,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NO_MFC 1
#define _APS_NEXT_RESOURCE_VALUE 180
-#define _APS_NEXT_COMMAND_VALUE 32780
+#define _APS_NEXT_COMMAND_VALUE 32781
#define _APS_NEXT_CONTROL_VALUE 1063
#define _APS_NEXT_SYMED_VALUE 110
#endif
