Skip to content

Commit

Permalink
Fix #306512: Improvements to the splash screen
Browse files Browse the repository at this point in the history
Rewrote the splash-screen code so that it renders everything on the fly using vector graphics instead of using pre-rendered images.

Also designed and implemented a darker version of splash screen that is automatically used for unstable/development builds.
  • Loading branch information
Spire42 committed Jun 9, 2020
1 parent 13793f9 commit c0e9777
Show file tree
Hide file tree
Showing 9 changed files with 348 additions and 18 deletions.
68 changes: 67 additions & 1 deletion CMakeSettings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,39 @@
{
// See https://go.microsoft.com//fwlink//?linkid=834763 for more information about this file.
"configurations": [
{
"name": "x64-Debug",
"generator": "Visual Studio 16 2019 Win64",
"configurationType": "Debug",
"inheritEnvironments": [ "msvc_x64_x64" ],
"buildRoot": "${projectDir}\\msvc.build_x64", // "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
"installRoot": "${projectDir}\\msvc.install_x64", // "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
"cmakeCommandArgs": "-Wno-deprecated",
"variables": [
{
"name": "CMAKE_BUILD_TYPE",
"value": "DEBUG"
},
{
"name": "BUILD_FOR_WINSTORE",
"value": "OFF"
},
{
"name": "BUILD_64",
"value": "ON"
},
{
"name": "CMAKE_PREFIX_PATH",
"value": "${env.PATH};${projectDir}\\dependencies"
},
{
"name": "CMAKE_LIBRARY_PATH",
"value": "${projectDir}\\dependencies\\libx64"
}
],
"buildCommandArgs": "",
"ctestCommandArgs": ""
},
{
"name": "x64-RelWithDebInfo",
"generator": "Visual Studio 16 2019 Win64",
Expand Down Expand Up @@ -33,6 +66,39 @@
],
"buildCommandArgs": "",
"ctestCommandArgs": ""
},
{
"name": "x64-Release",
"generator": "Visual Studio 16 2019 Win64",
"configurationType": "Release",
"inheritEnvironments": [ "msvc_x64_x64" ],
"buildRoot": "${projectDir}\\msvc.build_x64", // "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
"installRoot": "${projectDir}\\msvc.install_x64", // "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
"cmakeCommandArgs": "-Wno-deprecated",
"variables": [
{
"name": "CMAKE_BUILD_TYPE",
"value": "RELEASE"
},
{
"name": "BUILD_FOR_WINSTORE",
"value": "OFF"
},
{
"name": "BUILD_64",
"value": "ON"
},
{
"name": "CMAKE_PREFIX_PATH",
"value": "${env.PATH};${projectDir}\\dependencies"
},
{
"name": "CMAKE_LIBRARY_PATH",
"value": "${projectDir}\\dependencies\\libx64"
}
],
"buildCommandArgs": "",
"ctestCommandArgs": ""
}
]
}
}
8 changes: 8 additions & 0 deletions mscore/data/maintenance.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions mscore/data/musescore-logotype.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed mscore/data/splash.png
Binary file not shown.
Binary file removed mscore/data/splash@2x.png
Binary file not shown.
Loading

0 comments on commit c0e9777

Please sign in to comment.