Merge pull request #404 from jpcima/editor-cleanup

User interface update

appveyor.yml

@@ -1,5 +1,5 @@
 version: build-{build}
-image: Visual Studio 2017
+image: Visual Studio 2019
 configuration: Release
 platform:
 - Win32
@@ -22,7 +22,7 @@ before_build:
 - cmd: git submodule update --init
 - cmd: mkdir CMakeBuild
 - cmd: cd CMakeBuild
-- cmd: cmake .. -G"Visual Studio 15 2017" -A"%platform%" -DSFIZZ_JACK=OFF -DSFIZZ_BENCHMARKS=OFF -DSFIZZ_TESTS=OFF -DSFIZZ_LV2=ON -DSFIZZ_VST=ON -DCMAKE_BUILD_TYPE=Release -DVCPKG_TARGET_TRIPLET=%VCPKG_TRIPLET% -DCMAKE_TOOLCHAIN_FILE=C:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake
+- cmd: cmake .. -G"Visual Studio 16 2019" -A"%platform%" -DSFIZZ_JACK=OFF -DSFIZZ_BENCHMARKS=OFF -DSFIZZ_TESTS=OFF -DSFIZZ_LV2=ON -DSFIZZ_VST=ON -DCMAKE_BUILD_TYPE=Release -DVCPKG_TARGET_TRIPLET=%VCPKG_TRIPLET% -DCMAKE_TOOLCHAIN_FILE=C:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake
 
 build_script:
 - cmd: cmake --build . --config Release -j

editor/CMakeLists.txt

@@ -3,8 +3,28 @@ include("cmake/Vstgui.cmake")
 
 set(EDITOR_RESOURCES
     logo.png
+    logo_text.png
+    logo_text_white.png
+    logo_text@2x.png
+    logo_text_white@2x.png
+    background.png
+    background@2x.png
+    icon_white.png
+    icon_white@2x.png
+    knob48.png
+    knob48@2x.png
+    Fonts/fluentui-system-regular-20.ttf
+    Fonts/Roboto-Regular.ttf
     PARENT_SCOPE)
 
+function(copy_editor_resources SOURCE_DIR DESTINATION_DIR)
+    foreach(res ${EDITOR_RESOURCES})
+        get_filename_component(_dir "${res}" DIRECTORY)
+        file(MAKE_DIRECTORY "${DESTINATION_DIR}/${_dir}")
+        file(COPY "${SOURCE_DIR}/${res}" DESTINATION "${DESTINATION_DIR}/${_dir}")
+    endforeach()
+endfunction()
+
 # editor
 add_library(sfizz_editor STATIC EXCLUDE_FROM_ALL
     src/editor/EditIds.h
@@ -14,8 +34,53 @@ add_library(sfizz_editor STATIC EXCLUDE_FROM_ALL
     src/editor/EditorController.h
     src/editor/GUIComponents.h
     src/editor/GUIComponents.cpp
+    src/editor/NativeHelpers.h
+    src/editor/NativeHelpers.cpp
+    src/editor/layout/main.hpp
     src/editor/utility/vstgui_after.h
     src/editor/utility/vstgui_before.h)
 target_include_directories(sfizz_editor PUBLIC "src")
 target_link_libraries(sfizz_editor PRIVATE sfizz-vstgui)
 target_link_libraries(sfizz_editor PUBLIC absl::strings)
+if(APPLE)
+    find_library(APPLE_APPKIT_LIBRARY "AppKit")
+    find_library(APPLE_CORESERVICES_LIBRARY "CoreServices")
+    find_library(APPLE_FOUNDATION_LIBRARY "Foundation")
+    target_sources(sfizz_editor PRIVATE
+        src/editor/NativeHelpers.mm)
+    target_link_libraries(sfizz_editor PRIVATE
+        "${APPLE_APPKIT_LIBRARY}"
+        "${APPLE_CORESERVICES_LIBRARY}"
+        "${APPLE_FOUNDATION_LIBRARY}")
+    target_compile_options(sfizz_editor PRIVATE "-fobjc-arc")
+endif()
+
+# dependencies
+if(WIN32)
+    #
+elseif(APPLE)
+    #
+else()
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(sfizz-gio "gio-2.0" REQUIRED)
+    target_include_directories(sfizz_editor PRIVATE ${sfizz-gio_INCLUDE_DIRS})
+    target_link_libraries(sfizz_editor PRIVATE ${sfizz-gio_LIBRARIES})
+endif()
+target_include_directories(sfizz_editor PRIVATE "../src/external") # ghc::filesystem
+
+# layout tool
+if(NOT CMAKE_CROSSCOMPILING)
+    add_executable(layout-maker
+        "tools/layout-maker/sources/layout.h"
+        "tools/layout-maker/sources/reader.cpp"
+        "tools/layout-maker/sources/reader.h"
+        "tools/layout-maker/sources/main.cpp")
+    target_link_libraries(layout-maker PRIVATE absl::strings)
+
+    add_custom_command(
+        OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/src/editor/layout/main.hpp"
+        COMMAND "$<TARGET_FILE:layout-maker>"
+        "${CMAKE_CURRENT_SOURCE_DIR}/layout/main.fl"
+        > "${CMAKE_CURRENT_SOURCE_DIR}/src/editor/layout/main.hpp"
+        DEPENDS layout-maker "${CMAKE_CURRENT_SOURCE_DIR}/layout/main.fl")
+endif()

editor/cmake/Vstgui.cmake

@@ -201,6 +201,8 @@ endif()
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     # higher C++ requirement on Windows
     set_property(TARGET sfizz-vstgui PROPERTY CXX_STANDARD 14)
+    # Windows 10 RS2 DDI for custom fonts
+    target_compile_definitions(sfizz-vstgui PRIVATE "NTDDI_VERSION=0x0A000003")
 endif()
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")