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.

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

Fix preloading a zip in the web editor #93906

Merged
merged 1 commit into from
Jul 4, 2024

Conversation

paulsinnett
Copy link
Contributor

@paulsinnett paulsinnett commented Jul 3, 2024

When the versions went from 3 to 4 the MainLoop no longer responds to the files_dropped signal. This change sends the files_dropped signal to the root window and causes it to open the import dialog box.

@paulsinnett paulsinnett requested a review from a team as a code owner July 3, 2024 18:12
@AThousandShips AThousandShips changed the title fix for preloading a zip in the web editor Fix preloading a zip in the web editor Jul 3, 2024
@AThousandShips AThousandShips added this to the 4.4 milestone Jul 3, 2024
@Calinou Calinou added the cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release label Jul 3, 2024
@akien-mga akien-mga modified the milestones: 4.4, 4.3 Jul 3, 2024
@akien-mga akien-mga force-pushed the fix-web-editor-preload branch from b44b0d2 to 8b3dd85 Compare July 4, 2024 19:49
@akien-mga
Copy link
Member

akien-mga commented Jul 4, 2024

Amended the commit message to be clearer than "fix" (and squash the commits). Please keep in mind to write clear commit messages for future PRs, see https://github.com/godotengine/godot/blob/master/CONTRIBUTING.md#format-your-commit-messages-with-readability-in-mind

@akien-mga akien-mga force-pushed the fix-web-editor-preload branch from 8b3dd85 to db97d88 Compare July 4, 2024 20:13
@akien-mga akien-mga merged commit 6325d88 into godotengine:master Jul 4, 2024
18 checks passed
@akien-mga
Copy link
Member

Thanks! And congrats for your first merged Godot contribution 🎉

@paulsinnett paulsinnett deleted the fix-web-editor-preload branch July 5, 2024 01:24
@akien-mga
Copy link
Member

Seems like I introduced a bug when rebasing, I changed the include from scene/main/window.h to scene/main/scene_tree.h as this is what's being used, but it seems scene_tree.h only forward declares Window and relies on window.h being included when using it (which IMO is a bug). I'll fix it up.

platform/web/web_main.cpp:134:41: error: member access into incomplete type 'Window'
  134 |                 SceneTree::get_singleton()->get_root()->emit_signal(SNAME("files_dropped"), ps);
      |                                                       ^
./scene/main/scene_tree.h:44:7: note: forward declaration of 'Window'
   44 | class Window;
      |       ^

akien-mga added a commit that referenced this pull request Jul 5, 2024
My bad, I introduced the bug when amending it.
@akien-mga
Copy link
Member

Fixed up with ce16818. We should look into actually including window.h in scene_tree.h later on, but there's an #undef Window there so I suspect it might be a situation of circular deps.

sorascode pushed a commit to sorascode/godot-soras-version that referenced this pull request Jul 22, 2024
My bad, I introduced the bug when amending it.
Luis-Wong pushed a commit to Luis-Wong/godot that referenced this pull request Jul 26, 2024
My bad, I introduced the bug when amending it.
2nafish117 pushed a commit to 2nafish117/godot that referenced this pull request Aug 5, 2024
My bad, I introduced the bug when amending it.
chryan pushed a commit to chryan/godot that referenced this pull request Aug 6, 2024
My bad, I introduced the bug when amending it.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release platform:web topic:editor topic:porting
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Web Editor Preload doesn't automatically prompt to create folder
4 participants