Compare commits
9
Commits
v0.3.3
...
1c21d2d79b
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1c21d2d79b | ||
|
|
f607992885 | ||
|
|
10f32789e6 | ||
|
|
bf818bdd29 | ||
|
|
4946dd2033 | ||
|
|
7e5793bb17 | ||
|
|
f52fa0cb79 | ||
|
|
9c8afb7541 | ||
|
|
02f17165f2 |
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "@valknar/vpinball-wasm",
|
||||
"version": "0.3.3",
|
||||
"version": "0.3.4",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@valknar/vpinball-wasm",
|
||||
"version": "0.3.3",
|
||||
"version": "0.3.4",
|
||||
"license": "SEE LICENSE IN LICENSE",
|
||||
"devDependencies": {
|
||||
"typescript": "^5.6.0"
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@valknar/vpinball-wasm",
|
||||
"version": "0.3.3",
|
||||
"version": "0.3.4",
|
||||
"description": "Visual Pinball's engine compiled to WebAssembly - real .vpx tables, real VBScript, WebGL2 rendering, in the browser",
|
||||
"license": "SEE LICENSE IN LICENSE",
|
||||
"type": "module",
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
diff --git a/src/renderer/Window.cpp b/src/renderer/Window.cpp
|
||||
index 3dff060..92a96df 100644
|
||||
--- a/src/renderer/Window.cpp
|
||||
+++ b/src/renderer/Window.cpp
|
||||
@@ -264,6 +264,12 @@ Window::Window(const string& title, const Settings& settings, VPXWindowId window
|
||||
m_pixelDensity = 1.f;
|
||||
}
|
||||
|
||||
+#ifndef __EMSCRIPTEN__
|
||||
+ // SDL3's Emscripten video backend emulates SDL_SetWindowIcon by pointing
|
||||
+ // the page's <link rel="icon"> at a blob: URL of the encoded surface -
|
||||
+ // a reasonable desktop-icon mapping in general, but unwanted here where
|
||||
+ // the embedding page already has its own favicon. Skip it on this target
|
||||
+ // rather than fight it from the host page's JS.
|
||||
if (auto icon = BaseTexture::CreateFromFile(g_app->m_fileLocator.GetAppPath(FileLocator::AppSubFolder::Assets, "vpinball.png")); icon)
|
||||
{
|
||||
SDL_Surface* pSurface = icon->ToSDLSurface();
|
||||
@@ -276,6 +282,7 @@ Window::Window(const string& title, const Settings& settings, VPXWindowId window
|
||||
else {
|
||||
PLOGE << "Failed to load window icon: " << SDL_GetError();
|
||||
}
|
||||
+#endif
|
||||
|
||||
// Check if the platform allows positioning windows (as Wayland forbids it...)
|
||||
{
|
||||
Reference in New Issue
Block a user