Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Windows GUI: Use Edge WebView2 for HTML/Graph view #873

Merged
merged 3 commits into from
Oct 8, 2024
Merged

Windows GUI: Use Edge WebView2 for HTML/Graph view #873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
78d10f5
Windows GUI: Use Edge WebView2 for HTML/Graph view
cjee21 Jun 30, 2024
c3b5810
Windows GUI: Enable WebView2 native dark mode
cjee21 Jun 30, 2024
9945832
Windows GUI: Bundle WebView2Loader.dll
cjee21 Jul 3, 2024
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
1 change: 1 addition & 0 deletions Release/Release_GUI_Windows_i386.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ copy BCB\GUI\MediaInfo_GUI.exe BCB\GUI\MediaInfo.exe
copy ..\Project\BCB\GUI\Win32\Release\MediaInfo_GUI.exe MediaInfo_GUI_Windows_i386\MediaInfo.exe
xcopy ..\..\MediaInfoLib\Project\MSVC2019\Win32\Release\MediaInfo.dll MediaInfo_GUI_Windows_i386\ /S
xcopy ..\..\MediaInfoLib\Project\MSVC2019\Win32\Release\MediaInfo_InfoTip.dll MediaInfo_GUI_Windows_i386\ /S
xcopy "C:\Program Files (x86)\Embarcadero\Studio\22.0\Redist\win32\WebView2Loader.dll" MediaInfo_GUI_Windows_i386\

@rem --- Copying : Plugins ---
xcopy ..\Source\Resource\Plugin\* MediaInfo_GUI_Windows_i386\Plugin\ /S
Expand Down
1 change: 1 addition & 0 deletions Release/Release_GUI_Windows_x64.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ mkdir MediaInfo_GUI_Windows_x64
copy ..\Project\BCB\GUI\Win64\Release\MediaInfo_GUI.exe MediaInfo_GUI_Windows_x64\MediaInfo.exe
xcopy ..\..\MediaInfoLib\Project\MSVC2019\x64\Release\MediaInfo.dll MediaInfo_GUI_Windows_x64\ /S
xcopy ..\..\MediaInfoLib\Project\MSVC2019\x64\Release\MediaInfo_InfoTip.dll MediaInfo_GUI_Windows_x64\ /S
xcopy "C:\Program Files (x86)\Embarcadero\Studio\22.0\Redist\win64\WebView2Loader.dll" MediaInfo_GUI_Windows_x64\

@rem --- Copying : Plugins ---
xcopy ..\Source\Resource\Plugin\* MediaInfo_GUI_Windows_x64\Plugin\ /S
Expand Down
25 changes: 20 additions & 5 deletions Source/GUI/VCL/GUI_Main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,13 @@ std::wstring __fastcall TMainF::InjectHTMLStyle(const wchar_t* HTMLDocument) {
std::wstring modifiedHTML(HTMLDocument);
const wchar_t* StyleContent = L"";

//WebView2 Engine theme switching overrides
if (Prefs->Config(__T("Theme")).To_int32s()==1) //always light mode
StyleContent = L"<style>:root { --color-scheme: light; --border-color: navy; }</style>";
if (Prefs->Config(__T("Theme")).To_int32s()==2) //always dark mode
StyleContent = L"<style>:root { --color-scheme: dark; --border-color: blue; }</style>";
modifiedHTML = InsertText(modifiedHTML, L"</style>", StyleContent);

//IE Engine workarounds
if (TStyleManager::ActiveStyle == TStyleManager::Style[DARK_MODE_STYLE]) //app is currently in dark mode
StyleContent = L"<meta http-equiv='X-UA-Compatible' content='IE=edge'><style>body { background-color: #121212; color: #FFFFFF; } table { border:1px solid blue; }</style>";
Expand Down Expand Up @@ -255,12 +262,19 @@ __fastcall TMainF::TMainF(TComponent* Owner)
if (I == NULL)
I = new MediaInfoList;

// Intitialize views for HTML output (prevent graphviz plugin from reading invalid metrics)
Page_Custom_HTML->Navigate(L"about:blank");

//Load GUI preferences
GUI_Configure();

//Set Edge WebView2 UDF directory environment variable
Ztring UserDataDir=Prefs->BaseFolder;
UserDataDir.resize(UserDataDir.size()-1);
UserDataDir=UserDataDir.substr(0, UserDataDir.rfind(__T("\\"))+1);
UserDataDir+=__T("WebView2");
SetEnvironmentVariable(__T("WEBVIEW2_USER_DATA_FOLDER"), UserDataDir.c_str());

// Intitialize views for HTML output (prevent graphviz plugin from reading invalid metrics)
Page_Custom_HTML->Navigate(L"about:blank");

//File(s) in command line
#ifdef UNICODE
if (IsWin9X())
Expand Down Expand Up @@ -972,7 +986,7 @@ void __fastcall TMainF::Refresh(TTabSheet *Page)
{
Ztring TempA; TempA=Prefs->Translate(__T("At least one file"));
Ztring Temp;
Temp+=L"<!DOCTYPE html><html><head></head><body>";
Temp+=L"<!DOCTYPE html><html><head><style>:root { color-scheme: var(--color-scheme, light); } @media (prefers-color-scheme: dark) { :root { --color-scheme: dark; } }</style></head><body>";
Temp+=TempA.To_Unicode();
Temp+=L"</body></html>";
Temp=InjectHTMLStyle(Temp.c_str());
Expand Down Expand Up @@ -1098,7 +1112,7 @@ void __fastcall TMainF::Refresh(TTabSheet *Page)
S1 = State;
}

if (S1.size()>1 && S1[0]=='<' && S1[1]=='h')
if (S1.size()>1 && ( !wcsncmp(S1.c_str(),L"<!DOCTYPE html>",15-1) || !wcsncmp(S1.c_str(),L"<html>",6-1) ))
{
//Supposing this is HTML
Page_Custom_Text->Visible=false;
Expand All @@ -1112,6 +1126,7 @@ void __fastcall TMainF::Refresh(TTabSheet *Page)
FileName_Temp+=__T(".html");
}
F.Create(FileName_Temp, true);
S1=InjectHTMLStyle(S1.c_str());
F.Write(S1);
F.Close();
//Navigate
Expand Down
2 changes: 2 additions & 0 deletions Source/GUI/VCL/GUI_Main.dfm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,6 +587,7 @@ object MainF: TMainF
Width = 300
Height = 150
TabOrder = 0
SelectedEngine = EdgeIfAvailable
ControlData = {
4C000000021F0000810F00000000000000000000000000000000000000000000
000000004C000000000000000000000001000000E0D057007335CF11AE690800
Expand Down Expand Up @@ -627,6 +628,7 @@ object MainF: TMainF
Width = 300
Height = 369
TabOrder = 1
SelectedEngine = EdgeIfAvailable
ControlData = {
4C000000021F0000232600000000000000000000000000000000000000000000
000000004C000000000000000000000001000000E0D057007335CF11AE690800
Expand Down
4 changes: 4 additions & 0 deletions Source/Install/MediaInfo_GUI_Windows.nsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,13 @@ Section "SectionPrincipale" SEC01
File "/oname=MediaInfo.exe" "..\..\Project\BCB\GUI\Win64\Release\MediaInfo_GUI.exe"
File "..\..\..\MediaInfoLib\Project\MSVC2019\x64\Release\MediaInfo_InfoTip.dll"
File "..\..\..\MediaInfoLib\Project\MSVC2019\x64\Release\MediaInfo.dll"
File "C:\Program Files (x86)\Embarcadero\Studio\22.0\Redist\win64\WebView2Loader.dll"
File "$%BPATH%\Windows\libcurl\x64\Release\LIBCURL.DLL"
${Else}
File "/oname=MediaInfo.exe" "..\..\Project\BCB\GUI\Win32\Release\MediaInfo_GUI.exe"
File "..\..\..\MediaInfoLib\Project\MSVC2019\Win32\Release\MediaInfo_InfoTip.dll"
File "..\..\..\MediaInfoLib\Project\MSVC2019\Win32\Release\MediaInfo.dll"
File "C:\Program Files (x86)\Embarcadero\Studio\22.0\Redist\win32\WebView2Loader.dll"
File "$%BPATH%\Windows\libcurl\Win32\Release\LIBCURL.DLL"
${EndIf}
File "$%BPATH%\Windows\libcurl\curl-ca-bundle.crt"
Expand Down Expand Up @@ -211,6 +213,7 @@ Section Uninstall
!insertmacro UnInstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$INSTDIR\MediaInfo.exe"
!insertmacro UnInstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$INSTDIR\MediaInfo.dll"
!insertmacro UnInstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$INSTDIR\MediaInfo_i386.dll"
!insertmacro UnInstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$INSTDIR\WebView2Loader.dll"
Delete "$INSTDIR\${PRODUCT_NAME}.url"
Delete "$INSTDIR\uninst.exe"
Delete "$INSTDIR\MediaInfo_InfoTip.dll"
Expand All @@ -237,6 +240,7 @@ Section Uninstall
RMDir "$INSTDIR\Plugin\Sheet"
RMDir "$INSTDIR\Plugin\Tree"
RMDir "$INSTDIR\Plugin"
RMDir /r "$INSTDIR\WebView2"
RMDir "$INSTDIR"

SetRegView 64
Expand Down
3 changes: 3 additions & 0 deletions Source/Install/MediaInfo_GUI_Windows_i386.nsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ Section "SectionPrincipale" SEC01
File "/oname=MediaInfo.exe" "..\..\Project\BCB\GUI\Win32\Release\MediaInfo_GUI.exe"
File "..\..\..\MediaInfoLib\Project\MSVC2019\Win32\Release\MediaInfo_InfoTip.dll"
File "..\..\..\MediaInfoLib\Project\MSVC2019\Win32\Release\MediaInfo.dll"
File "C:\Program Files (x86)\Embarcadero\Studio\22.0\Redist\win32\WebView2Loader.dll"
File "$%BPATH%\Windows\libcurl\Win32\Release\LIBCURL.DLL"
File "$%BPATH%\Windows\libcurl\curl-ca-bundle.crt"
File "/oname=History.txt" "..\..\History_GUI.txt"
Expand Down Expand Up @@ -197,6 +198,7 @@ Section Uninstall
!insertmacro UnInstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$INSTDIR\MediaInfo.exe"
!insertmacro UnInstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$INSTDIR\MediaInfo.dll"
!insertmacro UnInstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$INSTDIR\MediaInfo_i386.dll"
!insertmacro UnInstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$INSTDIR\WebView2Loader.dll"
Delete "$INSTDIR\${PRODUCT_NAME}.url"
Delete "$INSTDIR\uninst.exe"
Delete "$INSTDIR\MediaInfo_InfoTip.dll"
Expand All @@ -223,6 +225,7 @@ Section Uninstall
RMDir "$INSTDIR\Plugin\Sheet"
RMDir "$INSTDIR\Plugin\Tree"
RMDir "$INSTDIR\Plugin"
RMDir /r "$INSTDIR\WebView2"
RMDir "$INSTDIR"

DeleteRegKey HKLM "${PRODUCT_REGISTRY}"
Expand Down
3 changes: 3 additions & 0 deletions Source/Install/MediaInfo_GUI_Windows_x64.nsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ Section "SectionPrincipale" SEC01
File "/oname=MediaInfo.exe" "..\..\Project\BCB\GUI\Win64\Release\MediaInfo_GUI.exe"
File "..\..\..\MediaInfoLib\Project\MSVC2019\x64\Release\MediaInfo_InfoTip.dll"
File "..\..\..\MediaInfoLib\Project\MSVC2019\x64\Release\MediaInfo.dll"
File "C:\Program Files (x86)\Embarcadero\Studio\22.0\Redist\win64\WebView2Loader.dll"
File "$%BPATH%\Windows\libcurl\x64\Release\LIBCURL.DLL"
File "$%BPATH%\Windows\libcurl\curl-ca-bundle.crt"
File "/oname=History.txt" "..\..\History_GUI.txt"
Expand Down Expand Up @@ -207,6 +208,7 @@ Section Uninstall
!insertmacro UnInstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$INSTDIR\MediaInfo.exe"
!insertmacro UnInstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$INSTDIR\MediaInfo.dll"
!insertmacro UnInstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$INSTDIR\MediaInfo_i386.dll"
!insertmacro UnInstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$INSTDIR\WebView2Loader.dll"
Delete "$INSTDIR\${PRODUCT_NAME}.url"
Delete "$INSTDIR\uninst.exe"
Delete "$INSTDIR\MediaInfo_InfoTip.dll"
Expand All @@ -233,6 +235,7 @@ Section Uninstall
RMDir "$INSTDIR\Plugin\Sheet"
RMDir "$INSTDIR\Plugin\Tree"
RMDir "$INSTDIR\Plugin"
RMDir /r "$INSTDIR\WebView2"
RMDir "$INSTDIR"

SetRegView 64
Expand Down
Loading