Skip to content

[48_11] Fix popup of QToolButton on wasm #1143

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

Draft
da-liii wants to merge 3 commits into
base: branch-1.2
Choose a base branch
from
Draft

[48_11] Fix popup of QToolButton on wasm #1143

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
d9090ef
Revert "[48_11] Disable toolbars on wasm"
da-liii Oct 3, 2023
6ac3c7f
Asyncify
da-liii Oct 3, 2023
7771b11
wip
da-liii Oct 3, 2023
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
7 changes: 0 additions & 7 deletions src/Plugins/Qt/qt_tm_widget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,6 @@ qt_tm_widget_rep::qt_tm_widget_rep(int mask, command _quit)
visibility[6] = (mask & 64) == 64; // side tools #0
visibility[7] = (mask & 128) == 128; // bottom tools

#ifdef OS_WASM
visibility[1] = false; // main
visibility[2] = false; // mode
visibility[3] = false; // focus
visibility[4] = false; // user
#endif

// general setup for main window

QMainWindow* mw= mainwindow ();
Expand Down
5 changes: 5 additions & 0 deletions xmake.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,8 @@ function add_target_draw()
add_files("src/Mogan/Draw/draw.cpp")

if is_plat("wasm") then
set_optimize("fastest")
add_ldflags("-sASYNCIFY")
add_ldflags("-s --preload-file $(projectdir)/TeXmacs@TeXmacs", {force = true})
end

Expand Down Expand Up @@ -694,6 +696,8 @@ function add_target_code()
add_files("src/Mogan/Code/code.cpp")

if is_plat("wasm") then
set_optimize("fastest")
add_ldflags("-sASYNCIFY")
add_ldflags("-s --preload-file $(projectdir)/TeXmacs@TeXmacs", {force = true})
end

Expand Down Expand Up @@ -778,6 +782,7 @@ function add_target_research_on_wasm()
add_files(plugin_xml_srcs)
add_files("src/Mogan/Research/research.cpp")

add_ldflags("-sASYNCIFY")
add_ldflags("-s --preload-file $(projectdir)/TeXmacs@TeXmacs", {force = true})

before_build(function (target)
Expand Down