Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ option(MUE_DOWNLOAD_SOUNDFONT "Download the latest soundfont version as part of
# === Pack ===
option(MUE_RUN_LRELEASE "Generate .qm files" ON)
option(MUE_INSTALL_SOUNDFONT "Install sound font" ON)
option(MUE_RUN_WINDEPLOYQT "Run windeployqt" ON)

# === Tests ===
set(MUE_VTEST_MSCORE_REF_BIN "${CMAKE_CURRENT_LIST_DIR}/../MU_ORIGIN/MuseScore/build.debug/install/${INSTALL_SUBDIR}/mscore" CACHE PATH "Path to mscore ref bin")
Expand Down
19 changes: 10 additions & 9 deletions src/app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -353,16 +353,17 @@ if (OS_IS_WIN)
configure_file(${PROJECT_SOURCE_DIR}/buildscripts/packaging/Windows/PortableApps/appinfo.ini.in ${CMAKE_INSTALL_PREFIX}/../../App/AppInfo/appinfo.ini @ONLY)
endif (WIN_PORTABLE)

set(deploy_tool_options_arg "--plugindir bin --qmldir ${PROJECT_SOURCE_DIR}")

qt_generate_deploy_qml_app_script(
TARGET MuseScoreStudio
OUTPUT_SCRIPT deploy_script
NO_UNSUPPORTED_PLATFORM_ERROR
DEPLOY_TOOL_OPTIONS ${deploy_tool_options_arg}
)
if (MUE_RUN_WINDEPLOYQT)
set(deploy_tool_options_arg "--plugindir bin --qmldir ${PROJECT_SOURCE_DIR}")
qt_generate_deploy_qml_app_script(
TARGET MuseScoreStudio
OUTPUT_SCRIPT deploy_script
NO_UNSUPPORTED_PLATFORM_ERROR
DEPLOY_TOOL_OPTIONS ${deploy_tool_options_arg}
)

install(SCRIPT ${deploy_script})
install(SCRIPT ${deploy_script})
endif() # MUE_RUN_WINDEPLOYQT

###########################################
# Linux
Expand Down
5 changes: 5 additions & 0 deletions src/app/internal/guiapp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,12 @@ void GuiApp::perform()

// The main window must be shown at this point so KDDockWidgets can read its size correctly
// and scale all sizes properly. https://github.com/musescore/MuseScore/issues/21148
// but before that, let's make the window transparent,
// otherwise the empty window frame will be visible
// https://github.com/musescore/MuseScore/issues/29630
// Transparency will be removed after the page loads.
QQuickWindow* w = dynamic_cast<QQuickWindow*>(obj);
w->setOpacity(0.01);
w->setVisible(true);

startupScenario()->runAfterSplashScreen();
Expand Down
1 change: 1 addition & 0 deletions src/appshell/qml/WindowContent.qml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ DockWindow {

onPageLoaded: {
interactiveProvider.onPageOpened()
window.opacity = 1.0
}

InteractiveProvider {
Expand Down
Loading