diff options
Diffstat (limited to 'platform/web')
-rw-r--r-- | platform/web/detect.py | 4 | ||||
-rw-r--r-- | platform/web/display_server_web.cpp | 4 | ||||
-rw-r--r-- | platform/web/display_server_web.h | 1 | ||||
-rw-r--r-- | platform/web/export/export_plugin.cpp | 6 | ||||
-rw-r--r-- | platform/web/export/export_plugin.h | 2 | ||||
-rw-r--r-- | platform/web/export/logo.svg (renamed from platform/web/logo.svg) | 0 | ||||
-rw-r--r-- | platform/web/export/run_icon.svg (renamed from platform/web/run_icon.svg) | 0 |
7 files changed, 9 insertions, 8 deletions
diff --git a/platform/web/detect.py b/platform/web/detect.py index 419d8918f2..2685cbcd63 100644 --- a/platform/web/detect.py +++ b/platform/web/detect.py @@ -17,10 +17,6 @@ if TYPE_CHECKING: from SCons import Environment -def is_active(): - return True - - def get_name(): return "Web" diff --git a/platform/web/display_server_web.cpp b/platform/web/display_server_web.cpp index 6cb56b404f..951ce110e0 100644 --- a/platform/web/display_server_web.cpp +++ b/platform/web/display_server_web.cpp @@ -1073,6 +1073,10 @@ void DisplayServerWeb::window_move_to_foreground(WindowID p_window) { // Not supported. } +bool DisplayServerWeb::window_is_focused(WindowID p_window) const { + return true; +} + bool DisplayServerWeb::window_can_draw(WindowID p_window) const { return true; } diff --git a/platform/web/display_server_web.h b/platform/web/display_server_web.h index 3b03b102cd..a4fd75f33b 100644 --- a/platform/web/display_server_web.h +++ b/platform/web/display_server_web.h @@ -211,6 +211,7 @@ public: virtual void window_request_attention(WindowID p_window = MAIN_WINDOW_ID) override; virtual void window_move_to_foreground(WindowID p_window = MAIN_WINDOW_ID) override; + virtual bool window_is_focused(WindowID p_window = MAIN_WINDOW_ID) const override; virtual bool window_can_draw(WindowID p_window = MAIN_WINDOW_ID) const override; diff --git a/platform/web/export/export_plugin.cpp b/platform/web/export/export_plugin.cpp index a398593f90..0bc3b92f09 100644 --- a/platform/web/export/export_plugin.cpp +++ b/platform/web/export/export_plugin.cpp @@ -30,8 +30,8 @@ #include "export_plugin.h" -#include "../logo_svg.gen.h" -#include "../run_icon_svg.gen.h" +#include "logo_svg.gen.h" +#include "run_icon_svg.gen.h" #include "core/config/project_settings.h" #include "editor/editor_scale.h" @@ -358,7 +358,7 @@ Ref<Texture2D> EditorExportPlatformWeb::get_logo() const { return logo; } -bool EditorExportPlatformWeb::has_valid_export_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const { +bool EditorExportPlatformWeb::has_valid_export_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates, bool p_debug) const { String err; bool valid = false; bool extensions = (bool)p_preset->get("variant/extensions_support"); diff --git a/platform/web/export/export_plugin.h b/platform/web/export/export_plugin.h index a1d3fed2f3..2de4a4c153 100644 --- a/platform/web/export/export_plugin.h +++ b/platform/web/export/export_plugin.h @@ -106,7 +106,7 @@ public: virtual String get_os_name() const override; virtual Ref<Texture2D> get_logo() const override; - virtual bool has_valid_export_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const override; + virtual bool has_valid_export_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates, bool p_debug = false) const override; virtual bool has_valid_project_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error) const override; virtual List<String> get_binary_extensions(const Ref<EditorExportPreset> &p_preset) const override; virtual Error export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags = 0) override; diff --git a/platform/web/logo.svg b/platform/web/export/logo.svg index 567b6f3c77..567b6f3c77 100644 --- a/platform/web/logo.svg +++ b/platform/web/export/logo.svg diff --git a/platform/web/run_icon.svg b/platform/web/export/run_icon.svg index 494f53cb90..494f53cb90 100644 --- a/platform/web/run_icon.svg +++ b/platform/web/export/run_icon.svg |