Log Message
[Win][MiniBrowser] Add 'Go Home' menu item and toolbar button https://bugs.webkit.org/show_bug.cgi?id=207749
Reviewed by Ross Kirsling. Added "Set Default URL to Current URL" menu item like Mac MiniBrowser. * MiniBrowser/win/MainWindow.cpp: (MainWindow::createToolbar): (MainWindow::WndProc): (MainWindow::setDefaultURLToCurrentURL): (MainWindow::goHome): Added. (MainWindow::onURLBarEnter): * MiniBrowser/win/MainWindow.h: * MiniBrowser/win/MiniBrowserLib.rc: * MiniBrowser/win/MiniBrowserLibResource.h: * MiniBrowser/win/MiniBrowserReplace.h: * MiniBrowser/win/WinMain.cpp: (wWinMain):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (257023 => 257024)
--- trunk/Tools/ChangeLog 2020-02-20 01:55:05 UTC (rev 257023)
+++ trunk/Tools/ChangeLog 2020-02-20 02:09:04 UTC (rev 257024)
@@ -1,3 +1,25 @@
+2020-02-19 Fujii Hironori <hironori.fu...@sony.com>
+
+ [Win][MiniBrowser] Add 'Go Home' menu item and toolbar button
+ https://bugs.webkit.org/show_bug.cgi?id=207749
+
+ Reviewed by Ross Kirsling.
+
+ Added "Set Default URL to Current URL" menu item like Mac MiniBrowser.
+
+ * MiniBrowser/win/MainWindow.cpp:
+ (MainWindow::createToolbar):
+ (MainWindow::WndProc):
+ (MainWindow::setDefaultURLToCurrentURL):
+ (MainWindow::goHome): Added.
+ (MainWindow::onURLBarEnter):
+ * MiniBrowser/win/MainWindow.h:
+ * MiniBrowser/win/MiniBrowserLib.rc:
+ * MiniBrowser/win/MiniBrowserLibResource.h:
+ * MiniBrowser/win/MiniBrowserReplace.h:
+ * MiniBrowser/win/WinMain.cpp:
+ (wWinMain):
+
2020-02-19 Peng Liu <peng.l...@apple.com>
Fix check-webkit-style errors related to AVFoundationSPI.h
Modified: trunk/Tools/MiniBrowser/win/MainWindow.cpp (257023 => 257024)
--- trunk/Tools/MiniBrowser/win/MainWindow.cpp 2020-02-20 01:55:05 UTC (rev 257023)
+++ trunk/Tools/MiniBrowser/win/MainWindow.cpp 2020-02-20 02:09:04 UTC (rev 257024)
@@ -46,6 +46,8 @@
float deviceScaleFactorForWindow(HWND);
}
+static const wchar_t* kMiniBrowserRegistryKey = L"Software\\WebKit\\MiniBrowser";
+
static constexpr int kToolbarImageSize = 24;
static constexpr int kToolbarURLBarIndex = 4;
static constexpr int kToolbarProgressIndicatorIndex = 6;
@@ -140,7 +142,7 @@
{ MAKELONG(HIST_BACK, ImageListID), IDM_HISTORY_BACKWARD, TBSTATE_ENABLED, buttonStyles | BTNS_DROPDOWN, { }, 0, (INT_PTR)L"Back" },
{ MAKELONG(HIST_FORWARD, ImageListID), IDM_HISTORY_FORWARD, TBSTATE_ENABLED, buttonStyles | BTNS_DROPDOWN, { }, 0, (INT_PTR)L"Forward"},
{ I_IMAGENONE, IDM_RELOAD, TBSTATE_ENABLED, buttonStyles | BTNS_SHOWTEXT, { }, 0, (INT_PTR)L"↺"},
- { I_IMAGENONE, IDM_RELOAD, 0, buttonStyles | BTNS_SHOWTEXT, { }, 0, (INT_PTR)L"⌂"},
+ { I_IMAGENONE, IDM_GO_HOME, TBSTATE_ENABLED, buttonStyles | BTNS_SHOWTEXT, { }, 0, (INT_PTR)L"⌂"},
{ 0, 0, TBSTATE_ENABLED, BTNS_SEP, { }, 0, 0}, // URL bar
{ MAKELONG(HIST_ADDTOFAVORITES, ImageListID), IDM_ABOUT, 0, buttonStyles, { }, 0, (INT_PTR)L"Add to Bookmarks"},
{ 0, 0, TBSTATE_ENABLED, BTNS_SEP, { }, 0, 0}, // Progress indicator
@@ -278,6 +280,7 @@
result = 1;
break;
case APPCOMMAND_BROWSER_HOME:
+ thisWindow->goHome();
break;
case APPCOMMAND_BROWSER_REFRESH:
thisWindow->browserWindow()->reload();
@@ -329,6 +332,9 @@
case IDM_ABOUT:
DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, About);
break;
+ case IDM_GO_HOME:
+ thisWindow->goHome();
+ break;
case IDM_EXIT:
DestroyWindow(hWnd);
break;
@@ -341,6 +347,9 @@
case IDM_PROXY_SETTINGS:
thisWindow->browserWindow()->openProxySettings();
break;
+ case IDM_SET_DEFAULT_URL:
+ thisWindow->setDefaultURLToCurrentURL();
+ break;
case IDM_CACHES:
if (!::IsWindow(thisWindow->m_hCacheWnd)) {
thisWindow->m_hCacheWnd = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_CACHES), hWnd, cachesDialogProc, reinterpret_cast<LPARAM>(thisWindow.get()));
@@ -425,6 +434,16 @@
}
}
+void MainWindow::setDefaultURLToCurrentURL()
+{
+ wchar_t url[INTERNET_MAX_URL_LENGTH];
+ GetWindowText(m_hURLBarWnd, url, INTERNET_MAX_URL_LENGTH);
+ auto length = wcslen(url);
+ if (!length)
+ return;
+ RegSetKeyValue(HKEY_CURRENT_USER, kMiniBrowserRegistryKey, L"DefaultURL", REG_SZ, url, (length + 1) * sizeof(wchar_t));
+}
+
bool MainWindow::toggleMenuItem(UINT menuID)
{
HMENU menu = ::GetMenu(hwnd());
@@ -587,12 +606,21 @@
SetFocus(m_browserWindow->hwnd());
}
+void MainWindow::goHome()
+{
+ std::wstring defaultURL = L"https://www.webkit.org/";
+ wchar_t url[INTERNET_MAX_URL_LENGTH];
+ DWORD urlLength = sizeof(url);
+ if (!RegGetValue(HKEY_CURRENT_USER, kMiniBrowserRegistryKey, L"DefaultURL", RRF_RT_REG_SZ, nullptr, &url, &urlLength))
+ defaultURL = url;
+ loadURL(defaultURL);
+}
+
void MainWindow::onURLBarEnter()
{
- wchar_t strPtr[INTERNET_MAX_URL_LENGTH];
- GetWindowText(m_hURLBarWnd, strPtr, INTERNET_MAX_URL_LENGTH);
- strPtr[INTERNET_MAX_URL_LENGTH - 1] = 0;
- loadURL(strPtr);
+ wchar_t url[INTERNET_MAX_URL_LENGTH];
+ GetWindowText(m_hURLBarWnd, url, INTERNET_MAX_URL_LENGTH);
+ loadURL(url);
}
void MainWindow::updateDeviceScaleFactor()
Modified: trunk/Tools/MiniBrowser/win/MainWindow.h (257023 => 257024)
--- trunk/Tools/MiniBrowser/win/MainWindow.h 2020-02-20 01:55:05 UTC (rev 257023)
+++ trunk/Tools/MiniBrowser/win/MainWindow.h 2020-02-20 02:09:04 UTC (rev 257024)
@@ -45,6 +45,7 @@
BrowserWindow* browserWindow() const { return m_browserWindow.get(); }
void loadURL(std::wstring);
+ void goHome();
static bool isInstance(HWND);
@@ -57,6 +58,7 @@
static size_t s_numInstances;
MainWindow();
+ void setDefaultURLToCurrentURL();
bool toggleMenuItem(UINT menuID);
void onURLBarEnter();
void updateDeviceScaleFactor();
Modified: trunk/Tools/MiniBrowser/win/MiniBrowserLib.rc (257023 => 257024)
--- trunk/Tools/MiniBrowser/win/MiniBrowserLib.rc 2020-02-20 01:55:05 UTC (rev 257023)
+++ trunk/Tools/MiniBrowser/win/MiniBrowserLib.rc 2020-02-20 02:09:04 UTC (rev 257024)
@@ -55,6 +55,7 @@
MENUITEM "Zoom In\tCtrl++", IDM_ZOOM_IN
MENUITEM "Zoom Out\tCtrl+-", IDM_ZOOM_OUT
MENUITEM "Invert Colors", IDM_INVERT_COLORS
+ MENUITEM "Go Home", IDM_GO_HOME
END
POPUP "&History"
BEGIN
@@ -96,6 +97,7 @@
MENUITEM "Other", IDM_UA_OTHER
END
MENUITEM "Proxy Settings...", IDM_PROXY_SETTINGS
+ MENUITEM "Set Default URL to Current URL", IDM_SET_DEFAULT_URL
MENUITEM SEPARATOR
MENUITEM "Disable Images", IDM_DISABLE_IMAGES
MENUITEM "Disable Styles", IDM_DISABLE_STYLES
Modified: trunk/Tools/MiniBrowser/win/MiniBrowserLibResource.h (257023 => 257024)
--- trunk/Tools/MiniBrowser/win/MiniBrowserLibResource.h 2020-02-20 01:55:05 UTC (rev 257023)
+++ trunk/Tools/MiniBrowser/win/MiniBrowserLibResource.h 2020-02-20 02:09:04 UTC (rev 257024)
@@ -126,6 +126,8 @@
#define IDM_PROXY_SETTINGS 32778
#define IDM_RELOAD 32779
#define IDM_CLOSE_WINDOW 32780
+#define IDM_GO_HOME 32781
+#define IDM_SET_DEFAULT_URL 32782
#define IDC_STATIC -1
// Next default values for new objects
@@ -134,7 +136,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NO_MFC 1
#define _APS_NEXT_RESOURCE_VALUE 181
-#define _APS_NEXT_COMMAND_VALUE 32785
+#define _APS_NEXT_COMMAND_VALUE 32783
#define _APS_NEXT_CONTROL_VALUE 1063
#define _APS_NEXT_SYMED_VALUE 110
#endif
Modified: trunk/Tools/MiniBrowser/win/MiniBrowserReplace.h (257023 => 257024)
--- trunk/Tools/MiniBrowser/win/MiniBrowserReplace.h 2020-02-20 01:55:05 UTC (rev 257023)
+++ trunk/Tools/MiniBrowser/win/MiniBrowserReplace.h 2020-02-20 02:09:04 UTC (rev 257024)
@@ -26,6 +26,4 @@
// This file is to make it easier for users to manage changes to the internals of MiniBrowser
-static const wchar_t* defaultURL = L"https://www.webkit.org/";
-
static void processCrashReport(const wchar_t* fileName) { ::MessageBox(0, fileName, L"Crash Report", MB_OK); }
Modified: trunk/Tools/MiniBrowser/win/WinMain.cpp (257023 => 257024)
--- trunk/Tools/MiniBrowser/win/WinMain.cpp 2020-02-20 01:55:05 UTC (rev 257023)
+++ trunk/Tools/MiniBrowser/win/WinMain.cpp 2020-02-20 02:09:04 UTC (rev 257024)
@@ -31,7 +31,6 @@
#include "stdafx.h"
#include "Common.h"
#include "MiniBrowserLibResource.h"
-#include "MiniBrowserReplace.h"
#include <wtf/win/SoftLinking.h>
#if USE(CF)
@@ -99,7 +98,7 @@
if (options.requestedURL.length())
mainWindow.loadURL(options.requestedURL.GetBSTR());
else
- mainWindow.browserWindow()->loadURL(_bstr_t(defaultURL).GetBSTR());
+ mainWindow.goHome();
#pragma warning(disable:4509)
_______________________________________________ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
