Ellet
1 year ago
parent
dc85c57229
commit
bd338c00c2
71 changed files with 1862 additions and 1593 deletions
@ -0,0 +1,28 @@ |
|||||||
|
# This file configures the analyzer, which statically analyzes Dart code to |
||||||
|
# check for errors, warnings, and lints. |
||||||
|
# |
||||||
|
# The issues identified by the analyzer are surfaced in the UI of Dart-enabled |
||||||
|
# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be |
||||||
|
# invoked from the command line by running `flutter analyze`. |
||||||
|
|
||||||
|
# The following line activates a set of recommended lints for Flutter apps, |
||||||
|
# packages, and plugins designed to encourage good coding practices. |
||||||
|
include: package:flutter_lints/flutter.yaml |
||||||
|
|
||||||
|
linter: |
||||||
|
# The lint rules applied to this project can be customized in the |
||||||
|
# section below to disable rules from the `package:flutter_lints/flutter.yaml` |
||||||
|
# included above or to enable additional rules. A list of all available lints |
||||||
|
# and their documentation is published at https://dart.dev/lints. |
||||||
|
# |
||||||
|
# Instead of disabling a lint rule for the entire project in the |
||||||
|
# section below, it can also be suppressed for a single line of code |
||||||
|
# or a specific dart file by using the `// ignore: name_of_lint` and |
||||||
|
# `// ignore_for_file: name_of_lint` syntax on the line or in the file |
||||||
|
# producing the lint. |
||||||
|
rules: |
||||||
|
# avoid_print: false # Uncomment to disable the `avoid_print` rule |
||||||
|
# prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule |
||||||
|
|
||||||
|
# Additional information about this file can be found at |
||||||
|
# https://dart.dev/guides/language/analysis-options |
||||||
@ -1,8 +1,7 @@ |
|||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" |
<manifest xmlns:android="http://schemas.android.com/apk/res/android"> |
||||||
package="com.example.app"> |
<!-- The INTERNET permission is required for development. Specifically, |
||||||
<!-- Flutter needs it to communicate with the running application |
the Flutter tool needs it to communicate with the running application |
||||||
to allow setting breakpoints, to provide hot reload, etc. |
to allow setting breakpoints, to provide hot reload, etc. |
||||||
--> |
--> |
||||||
<uses-permission android:name="android.permission.INTERNET"/> |
<uses-permission android:name="android.permission.INTERNET"/> |
||||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> |
|
||||||
</manifest> |
</manifest> |
||||||
|
|||||||
@ -1,8 +1,7 @@ |
|||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" |
<manifest xmlns:android="http://schemas.android.com/apk/res/android"> |
||||||
package="com.example.app"> |
<!-- The INTERNET permission is required for development. Specifically, |
||||||
<!-- Flutter needs it to communicate with the running application |
the Flutter tool needs it to communicate with the running application |
||||||
to allow setting breakpoints, to provide hot reload, etc. |
to allow setting breakpoints, to provide hot reload, etc. |
||||||
--> |
--> |
||||||
<uses-permission android:name="android.permission.INTERNET"/> |
<uses-permission android:name="android.permission.INTERNET"/> |
||||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> |
|
||||||
</manifest> |
</manifest> |
||||||
|
|||||||
@ -1,3 +1,6 @@ |
|||||||
org.gradle.jvmargs=-Xmx1536M |
org.gradle.jvmargs=-Xmx1536M |
||||||
android.useAndroidX=true |
android.useAndroidX=true |
||||||
android.enableJetifier=true |
android.enableJetifier=true |
||||||
|
android.defaults.buildfeatures.buildconfig=true |
||||||
|
android.nonTransitiveRClass=false |
||||||
|
android.nonFinalResIds=false |
||||||
|
|||||||
@ -1,6 +1,5 @@ |
|||||||
#Fri Jun 23 08:50:38 CEST 2017 |
|
||||||
distributionBase=GRADLE_USER_HOME |
distributionBase=GRADLE_USER_HOME |
||||||
distributionPath=wrapper/dists |
distributionPath=wrapper/dists |
||||||
zipStoreBase=GRADLE_USER_HOME |
zipStoreBase=GRADLE_USER_HOME |
||||||
zipStorePath=wrapper/dists |
zipStorePath=wrapper/dists |
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip |
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip |
||||||
|
|||||||
@ -1,11 +1,20 @@ |
|||||||
include ':app' |
pluginManagement { |
||||||
|
def flutterSdkPath = { |
||||||
|
def properties = new Properties() |
||||||
|
file("local.properties").withInputStream { properties.load(it) } |
||||||
|
def flutterSdkPath = properties.getProperty("flutter.sdk") |
||||||
|
assert flutterSdkPath != null, "flutter.sdk not set in local.properties" |
||||||
|
return flutterSdkPath |
||||||
|
} |
||||||
|
settings.ext.flutterSdkPath = flutterSdkPath() |
||||||
|
|
||||||
def localPropertiesFile = new File(rootProject.projectDir, "local.properties") |
includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle") |
||||||
def properties = new Properties() |
|
||||||
|
|
||||||
assert localPropertiesFile.exists() |
plugins { |
||||||
localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } |
id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
def flutterSdkPath = properties.getProperty("flutter.sdk") |
include ":app" |
||||||
assert flutterSdkPath != null, "flutter.sdk not set in local.properties" |
|
||||||
apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" |
apply from: "${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle/app_plugin_loader.gradle" |
||||||
|
|||||||
@ -1,6 +0,0 @@ |
|||||||
#import <Flutter/Flutter.h> |
|
||||||
#import <UIKit/UIKit.h> |
|
||||||
|
|
||||||
@interface AppDelegate : FlutterAppDelegate |
|
||||||
|
|
||||||
@end |
|
||||||
@ -1,13 +0,0 @@ |
|||||||
#import "AppDelegate.h" |
|
||||||
#import "GeneratedPluginRegistrant.h" |
|
||||||
|
|
||||||
@implementation AppDelegate |
|
||||||
|
|
||||||
- (BOOL)application:(UIApplication *)application |
|
||||||
didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { |
|
||||||
[GeneratedPluginRegistrant registerWithRegistry:self]; |
|
||||||
// Override point for customization after application launch. |
|
||||||
return [super application:application didFinishLaunchingWithOptions:launchOptions]; |
|
||||||
} |
|
||||||
|
|
||||||
@end |
|
||||||
|
Before Width: | Height: | Size: 564 B After Width: | Height: | Size: 295 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 406 B |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 450 B |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 282 B |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 462 B |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 704 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 406 B |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 586 B |
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 862 B |
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 862 B |
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 762 B |
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 1.4 KiB |
@ -1,9 +0,0 @@ |
|||||||
#import <Flutter/Flutter.h> |
|
||||||
#import <UIKit/UIKit.h> |
|
||||||
#import "AppDelegate.h" |
|
||||||
|
|
||||||
int main(int argc, char* argv[]) { |
|
||||||
@autoreleasepool { |
|
||||||
return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); |
|
||||||
} |
|
||||||
} |
|
||||||
@ -0,0 +1,12 @@ |
|||||||
|
import Flutter |
||||||
|
import UIKit |
||||||
|
import XCTest |
||||||
|
|
||||||
|
class RunnerTests: XCTestCase { |
||||||
|
|
||||||
|
func testExample() { |
||||||
|
// If you add code to the Runner application, consider adding tests here. |
||||||
|
// See https://developer.apple.com/documentation/xctest for more information about using XCTest. |
||||||
|
} |
||||||
|
|
||||||
|
} |
||||||
@ -1,3 +1,3 @@ |
|||||||
class PlatformViewRegistry { |
// class PlatformViewRegistry { |
||||||
static void registerViewFactory(String viewId, dynamic cb) {} |
// static void registerViewFactory(String viewId, dynamic cb) {} |
||||||
} |
// } |
||||||
|
|||||||
@ -1,7 +1,7 @@ |
|||||||
import 'dart:ui' if (dart.library.html) 'dart:ui_web' as ui; |
// import 'dart:ui' if (dart.library.html) 'dart:ui_web' as ui; |
||||||
|
|
||||||
class PlatformViewRegistry { |
// class PlatformViewRegistry { |
||||||
static void registerViewFactory(String viewId, dynamic cb) { |
// static void registerViewFactory(String viewId, dynamic cb) { |
||||||
ui.platformViewRegistry.registerViewFactory(viewId, cb); |
// ui.platformViewRegistry.registerViewFactory(viewId, cb); |
||||||
} |
// } |
||||||
} |
// } |
||||||
|
|||||||
@ -1 +1 @@ |
|||||||
flutter/ephemeral |
flutter/ephemeral |
||||||
|
|||||||
@ -1,106 +1,139 @@ |
|||||||
cmake_minimum_required(VERSION 3.10) |
# Project-level configuration. |
||||||
project(runner LANGUAGES CXX) |
cmake_minimum_required(VERSION 3.10) |
||||||
|
project(runner LANGUAGES CXX) |
||||||
set(BINARY_NAME "app") |
|
||||||
set(APPLICATION_ID "com.example.app") |
# The name of the executable created for the application. Change this to change |
||||||
|
# the on-disk name of your application. |
||||||
cmake_policy(SET CMP0063 NEW) |
set(BINARY_NAME "example") |
||||||
|
# The unique GTK application identifier for this application. See: |
||||||
set(CMAKE_INSTALL_RPATH "$ORIGIN/lib") |
# https://wiki.gnome.org/HowDoI/ChooseApplicationID |
||||||
|
set(APPLICATION_ID "com.example.example") |
||||||
# Configure build options. |
|
||||||
if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) |
# Explicitly opt in to modern CMake behaviors to avoid warnings with recent |
||||||
set(CMAKE_BUILD_TYPE "Debug" CACHE |
# versions of CMake. |
||||||
STRING "Flutter build mode" FORCE) |
cmake_policy(SET CMP0063 NEW) |
||||||
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS |
|
||||||
"Debug" "Profile" "Release") |
# Load bundled libraries from the lib/ directory relative to the binary. |
||||||
endif() |
set(CMAKE_INSTALL_RPATH "$ORIGIN/lib") |
||||||
|
|
||||||
# Compilation settings that should be applied to most targets. |
# Root filesystem for cross-building. |
||||||
function(APPLY_STANDARD_SETTINGS TARGET) |
if(FLUTTER_TARGET_PLATFORM_SYSROOT) |
||||||
target_compile_features(${TARGET} PUBLIC cxx_std_14) |
set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT}) |
||||||
target_compile_options(${TARGET} PRIVATE -Wall -Werror) |
set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT}) |
||||||
target_compile_options(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:-O3>") |
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) |
||||||
target_compile_definitions(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:NDEBUG>") |
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) |
||||||
endfunction() |
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) |
||||||
|
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) |
||||||
set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") |
endif() |
||||||
|
|
||||||
# Flutter library and tool build rules. |
# Define build configuration options. |
||||||
add_subdirectory(${FLUTTER_MANAGED_DIR}) |
if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) |
||||||
|
set(CMAKE_BUILD_TYPE "Debug" CACHE |
||||||
# System-level dependencies. |
STRING "Flutter build mode" FORCE) |
||||||
find_package(PkgConfig REQUIRED) |
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS |
||||||
pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) |
"Debug" "Profile" "Release") |
||||||
|
endif() |
||||||
add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}") |
|
||||||
|
# Compilation settings that should be applied to most targets. |
||||||
# Application build |
# |
||||||
add_executable(${BINARY_NAME} |
# Be cautious about adding new options here, as plugins use this function by |
||||||
"main.cc" |
# default. In most cases, you should add new options to specific targets instead |
||||||
"my_application.cc" |
# of modifying this function. |
||||||
"${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" |
function(APPLY_STANDARD_SETTINGS TARGET) |
||||||
) |
target_compile_features(${TARGET} PUBLIC cxx_std_14) |
||||||
apply_standard_settings(${BINARY_NAME}) |
target_compile_options(${TARGET} PRIVATE -Wall -Werror) |
||||||
target_link_libraries(${BINARY_NAME} PRIVATE flutter) |
target_compile_options(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:-O3>") |
||||||
target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK) |
target_compile_definitions(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:NDEBUG>") |
||||||
add_dependencies(${BINARY_NAME} flutter_assemble) |
endfunction() |
||||||
# Only the install-generated bundle's copy of the executable will launch |
|
||||||
# correctly, since the resources must in the right relative locations. To avoid |
# Flutter library and tool build rules. |
||||||
# people trying to run the unbundled copy, put it in a subdirectory instead of |
set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") |
||||||
# the default top-level location. |
add_subdirectory(${FLUTTER_MANAGED_DIR}) |
||||||
set_target_properties(${BINARY_NAME} |
|
||||||
PROPERTIES |
# System-level dependencies. |
||||||
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run" |
find_package(PkgConfig REQUIRED) |
||||||
) |
pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) |
||||||
|
|
||||||
# Generated plugin build rules, which manage building the plugins and adding |
add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}") |
||||||
# them to the application. |
|
||||||
include(flutter/generated_plugins.cmake) |
# Define the application target. To change its name, change BINARY_NAME above, |
||||||
|
# not the value here, or `flutter run` will no longer work. |
||||||
|
# |
||||||
# === Installation === |
# Any new source files that you add to the application should be added here. |
||||||
# By default, "installing" just makes a relocatable bundle in the build |
add_executable(${BINARY_NAME} |
||||||
# directory. |
"main.cc" |
||||||
set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle") |
"my_application.cc" |
||||||
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) |
"${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" |
||||||
set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) |
) |
||||||
endif() |
|
||||||
|
# Apply the standard set of build settings. This can be removed for applications |
||||||
# Start with a clean build bundle directory every time. |
# that need different build settings. |
||||||
install(CODE " |
apply_standard_settings(${BINARY_NAME}) |
||||||
file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\") |
|
||||||
" COMPONENT Runtime) |
# Add dependency libraries. Add any application-specific dependencies here. |
||||||
|
target_link_libraries(${BINARY_NAME} PRIVATE flutter) |
||||||
set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") |
target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK) |
||||||
set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib") |
|
||||||
|
# Run the Flutter tool portions of the build. This must not be removed. |
||||||
install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" |
add_dependencies(${BINARY_NAME} flutter_assemble) |
||||||
COMPONENT Runtime) |
|
||||||
|
# Only the install-generated bundle's copy of the executable will launch |
||||||
install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" |
# correctly, since the resources must in the right relative locations. To avoid |
||||||
COMPONENT Runtime) |
# people trying to run the unbundled copy, put it in a subdirectory instead of |
||||||
|
# the default top-level location. |
||||||
install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" |
set_target_properties(${BINARY_NAME} |
||||||
COMPONENT Runtime) |
PROPERTIES |
||||||
|
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run" |
||||||
if(PLUGIN_BUNDLED_LIBRARIES) |
) |
||||||
install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" |
|
||||||
DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" |
|
||||||
COMPONENT Runtime) |
# Generated plugin build rules, which manage building the plugins and adding |
||||||
endif() |
# them to the application. |
||||||
|
include(flutter/generated_plugins.cmake) |
||||||
# Fully re-copy the assets directory on each build to avoid having stale files |
|
||||||
# from a previous install. |
|
||||||
set(FLUTTER_ASSET_DIR_NAME "flutter_assets") |
# === Installation === |
||||||
install(CODE " |
# By default, "installing" just makes a relocatable bundle in the build |
||||||
file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") |
# directory. |
||||||
" COMPONENT Runtime) |
set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle") |
||||||
install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" |
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) |
||||||
DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) |
set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) |
||||||
|
endif() |
||||||
# Install the AOT library on non-Debug builds only. |
|
||||||
if(NOT CMAKE_BUILD_TYPE MATCHES "Debug") |
# Start with a clean build bundle directory every time. |
||||||
install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" |
install(CODE " |
||||||
COMPONENT Runtime) |
file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\") |
||||||
endif() |
" COMPONENT Runtime) |
||||||
|
|
||||||
|
set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") |
||||||
|
set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib") |
||||||
|
|
||||||
|
install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" |
||||||
|
COMPONENT Runtime) |
||||||
|
|
||||||
|
install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" |
||||||
|
COMPONENT Runtime) |
||||||
|
|
||||||
|
install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" |
||||||
|
COMPONENT Runtime) |
||||||
|
|
||||||
|
foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES}) |
||||||
|
install(FILES "${bundled_library}" |
||||||
|
DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" |
||||||
|
COMPONENT Runtime) |
||||||
|
endforeach(bundled_library) |
||||||
|
|
||||||
|
# Fully re-copy the assets directory on each build to avoid having stale files |
||||||
|
# from a previous install. |
||||||
|
set(FLUTTER_ASSET_DIR_NAME "flutter_assets") |
||||||
|
install(CODE " |
||||||
|
file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") |
||||||
|
" COMPONENT Runtime) |
||||||
|
install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" |
||||||
|
DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) |
||||||
|
|
||||||
|
# Install the AOT library on non-Debug builds only. |
||||||
|
if(NOT CMAKE_BUILD_TYPE MATCHES "Debug") |
||||||
|
install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" |
||||||
|
COMPONENT Runtime) |
||||||
|
endif() |
||||||
|
|||||||
@ -1,91 +1,88 @@ |
|||||||
cmake_minimum_required(VERSION 3.10) |
# This file controls Flutter-level build steps. It should not be edited. |
||||||
|
cmake_minimum_required(VERSION 3.10) |
||||||
set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") |
|
||||||
|
set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") |
||||||
# Configuration provided via flutter tool. |
|
||||||
include(${EPHEMERAL_DIR}/generated_config.cmake) |
# Configuration provided via flutter tool. |
||||||
|
include(${EPHEMERAL_DIR}/generated_config.cmake) |
||||||
# TODO: Move the rest of this into files in ephemeral. See |
|
||||||
# https://github.com/flutter/flutter/issues/57146. |
# TODO: Move the rest of this into files in ephemeral. See |
||||||
|
# https://github.com/flutter/flutter/issues/57146. |
||||||
# Serves the same purpose as list(TRANSFORM ... PREPEND ...), |
|
||||||
# which isn't available in 3.10. |
# Serves the same purpose as list(TRANSFORM ... PREPEND ...), |
||||||
function(list_prepend LIST_NAME PREFIX) |
# which isn't available in 3.10. |
||||||
set(NEW_LIST "") |
function(list_prepend LIST_NAME PREFIX) |
||||||
foreach(element ${${LIST_NAME}}) |
set(NEW_LIST "") |
||||||
list(APPEND NEW_LIST "${PREFIX}${element}") |
foreach(element ${${LIST_NAME}}) |
||||||
endforeach(element) |
list(APPEND NEW_LIST "${PREFIX}${element}") |
||||||
set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE) |
endforeach(element) |
||||||
endfunction() |
set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE) |
||||||
|
endfunction() |
||||||
# === Flutter Library === |
|
||||||
# System-level dependencies. |
# === Flutter Library === |
||||||
find_package(PkgConfig REQUIRED) |
# System-level dependencies. |
||||||
pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) |
find_package(PkgConfig REQUIRED) |
||||||
pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) |
pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) |
||||||
pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) |
pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) |
||||||
pkg_check_modules(BLKID REQUIRED IMPORTED_TARGET blkid) |
pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) |
||||||
pkg_check_modules(LZMA REQUIRED IMPORTED_TARGET liblzma) |
|
||||||
|
set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so") |
||||||
set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so") |
|
||||||
|
# Published to parent scope for install step. |
||||||
# Published to parent scope for install step. |
set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) |
||||||
set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) |
set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) |
||||||
set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) |
set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) |
||||||
set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) |
set(AOT_LIBRARY "${PROJECT_DIR}/build/lib/libapp.so" PARENT_SCOPE) |
||||||
set(AOT_LIBRARY "${PROJECT_DIR}/build/lib/libapp.so" PARENT_SCOPE) |
|
||||||
|
list(APPEND FLUTTER_LIBRARY_HEADERS |
||||||
list(APPEND FLUTTER_LIBRARY_HEADERS |
"fl_basic_message_channel.h" |
||||||
"fl_basic_message_channel.h" |
"fl_binary_codec.h" |
||||||
"fl_binary_codec.h" |
"fl_binary_messenger.h" |
||||||
"fl_binary_messenger.h" |
"fl_dart_project.h" |
||||||
"fl_dart_project.h" |
"fl_engine.h" |
||||||
"fl_engine.h" |
"fl_json_message_codec.h" |
||||||
"fl_json_message_codec.h" |
"fl_json_method_codec.h" |
||||||
"fl_json_method_codec.h" |
"fl_message_codec.h" |
||||||
"fl_message_codec.h" |
"fl_method_call.h" |
||||||
"fl_method_call.h" |
"fl_method_channel.h" |
||||||
"fl_method_channel.h" |
"fl_method_codec.h" |
||||||
"fl_method_codec.h" |
"fl_method_response.h" |
||||||
"fl_method_response.h" |
"fl_plugin_registrar.h" |
||||||
"fl_plugin_registrar.h" |
"fl_plugin_registry.h" |
||||||
"fl_plugin_registry.h" |
"fl_standard_message_codec.h" |
||||||
"fl_standard_message_codec.h" |
"fl_standard_method_codec.h" |
||||||
"fl_standard_method_codec.h" |
"fl_string_codec.h" |
||||||
"fl_string_codec.h" |
"fl_value.h" |
||||||
"fl_value.h" |
"fl_view.h" |
||||||
"fl_view.h" |
"flutter_linux.h" |
||||||
"flutter_linux.h" |
) |
||||||
) |
list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/") |
||||||
list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/") |
add_library(flutter INTERFACE) |
||||||
add_library(flutter INTERFACE) |
target_include_directories(flutter INTERFACE |
||||||
target_include_directories(flutter INTERFACE |
"${EPHEMERAL_DIR}" |
||||||
"${EPHEMERAL_DIR}" |
) |
||||||
) |
target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}") |
||||||
target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}") |
target_link_libraries(flutter INTERFACE |
||||||
target_link_libraries(flutter INTERFACE |
PkgConfig::GTK |
||||||
PkgConfig::GTK |
PkgConfig::GLIB |
||||||
PkgConfig::GLIB |
PkgConfig::GIO |
||||||
PkgConfig::GIO |
) |
||||||
PkgConfig::BLKID |
add_dependencies(flutter flutter_assemble) |
||||||
PkgConfig::LZMA |
|
||||||
) |
# === Flutter tool backend === |
||||||
add_dependencies(flutter flutter_assemble) |
# _phony_ is a non-existent file to force this command to run every time, |
||||||
|
# since currently there's no way to get a full input/output list from the |
||||||
# === Flutter tool backend === |
# flutter tool. |
||||||
# _phony_ is a non-existent file to force this command to run every time, |
add_custom_command( |
||||||
# since currently there's no way to get a full input/output list from the |
OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} |
||||||
# flutter tool. |
${CMAKE_CURRENT_BINARY_DIR}/_phony_ |
||||||
add_custom_command( |
COMMAND ${CMAKE_COMMAND} -E env |
||||||
OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} |
${FLUTTER_TOOL_ENVIRONMENT} |
||||||
${CMAKE_CURRENT_BINARY_DIR}/_phony_ |
"${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh" |
||||||
COMMAND ${CMAKE_COMMAND} -E env |
${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE} |
||||||
${FLUTTER_TOOL_ENVIRONMENT} |
VERBATIM |
||||||
"${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh" |
) |
||||||
${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE} |
add_custom_target(flutter_assemble DEPENDS |
||||||
VERBATIM |
"${FLUTTER_LIBRARY}" |
||||||
) |
${FLUTTER_LIBRARY_HEADERS} |
||||||
add_custom_target(flutter_assemble DEPENDS |
) |
||||||
"${FLUTTER_LIBRARY}" |
|
||||||
${FLUTTER_LIBRARY_HEADERS} |
|
||||||
) |
|
||||||
|
|||||||
@ -1,6 +1,6 @@ |
|||||||
#include "my_application.h" |
#include "my_application.h" |
||||||
|
|
||||||
int main(int argc, char** argv) { |
int main(int argc, char** argv) { |
||||||
g_autoptr(MyApplication) app = my_application_new(); |
g_autoptr(MyApplication) app = my_application_new(); |
||||||
return g_application_run(G_APPLICATION(app), argc, argv); |
return g_application_run(G_APPLICATION(app), argc, argv); |
||||||
} |
} |
||||||
|
|||||||
@ -1,104 +1,104 @@ |
|||||||
#include "my_application.h" |
#include "my_application.h" |
||||||
|
|
||||||
#include <flutter_linux/flutter_linux.h> |
#include <flutter_linux/flutter_linux.h> |
||||||
#ifdef GDK_WINDOWING_X11 |
#ifdef GDK_WINDOWING_X11 |
||||||
#include <gdk/gdkx.h> |
#include <gdk/gdkx.h> |
||||||
#endif |
#endif |
||||||
|
|
||||||
#include "flutter/generated_plugin_registrant.h" |
#include "flutter/generated_plugin_registrant.h" |
||||||
|
|
||||||
struct _MyApplication { |
struct _MyApplication { |
||||||
GtkApplication parent_instance; |
GtkApplication parent_instance; |
||||||
char** dart_entrypoint_arguments; |
char** dart_entrypoint_arguments; |
||||||
}; |
}; |
||||||
|
|
||||||
G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION) |
G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION) |
||||||
|
|
||||||
// Implements GApplication::activate.
|
// Implements GApplication::activate.
|
||||||
static void my_application_activate(GApplication* application) { |
static void my_application_activate(GApplication* application) { |
||||||
MyApplication* self = MY_APPLICATION(application); |
MyApplication* self = MY_APPLICATION(application); |
||||||
GtkWindow* window = |
GtkWindow* window = |
||||||
GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application))); |
GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application))); |
||||||
|
|
||||||
// Use a header bar when running in GNOME as this is the common style used
|
// Use a header bar when running in GNOME as this is the common style used
|
||||||
// by applications and is the setup most users will be using (e.g. Ubuntu
|
// by applications and is the setup most users will be using (e.g. Ubuntu
|
||||||
// desktop).
|
// desktop).
|
||||||
// If running on X and not using GNOME then just use a traditional title bar
|
// If running on X and not using GNOME then just use a traditional title bar
|
||||||
// in case the window manager does more exotic layout, e.g. tiling.
|
// in case the window manager does more exotic layout, e.g. tiling.
|
||||||
// If running on Wayland assume the header bar will work (may need changing
|
// If running on Wayland assume the header bar will work (may need changing
|
||||||
// if future cases occur).
|
// if future cases occur).
|
||||||
gboolean use_header_bar = FALSE; |
gboolean use_header_bar = TRUE; |
||||||
#ifdef GDK_WINDOWING_X11 |
#ifdef GDK_WINDOWING_X11 |
||||||
GdkScreen *screen = gtk_window_get_screen(window); |
GdkScreen* screen = gtk_window_get_screen(window); |
||||||
if (GDK_IS_X11_SCREEN(screen)) { |
if (GDK_IS_X11_SCREEN(screen)) { |
||||||
const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen); |
const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen); |
||||||
if (g_strcmp0(wm_name, "GNOME Shell") != 0) { |
if (g_strcmp0(wm_name, "GNOME Shell") != 0) { |
||||||
use_header_bar = FALSE; |
use_header_bar = FALSE; |
||||||
} |
} |
||||||
} |
} |
||||||
#endif |
#endif |
||||||
if (use_header_bar) { |
if (use_header_bar) { |
||||||
GtkHeaderBar *header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); |
GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); |
||||||
gtk_widget_show(GTK_WIDGET(header_bar)); |
gtk_widget_show(GTK_WIDGET(header_bar)); |
||||||
gtk_header_bar_set_title(header_bar, "app"); |
gtk_header_bar_set_title(header_bar, "example"); |
||||||
gtk_header_bar_set_show_close_button(header_bar, TRUE); |
gtk_header_bar_set_show_close_button(header_bar, TRUE); |
||||||
gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); |
gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); |
||||||
} |
} else { |
||||||
else { |
gtk_window_set_title(window, "example"); |
||||||
gtk_window_set_title(window, "app"); |
} |
||||||
} |
|
||||||
|
gtk_window_set_default_size(window, 1280, 720); |
||||||
gtk_window_set_default_size(window, 1280, 720); |
gtk_widget_show(GTK_WIDGET(window)); |
||||||
gtk_widget_show(GTK_WIDGET(window)); |
|
||||||
|
g_autoptr(FlDartProject) project = fl_dart_project_new(); |
||||||
g_autoptr(FlDartProject) project = fl_dart_project_new(); |
fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments); |
||||||
fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments); |
|
||||||
|
FlView* view = fl_view_new(project); |
||||||
FlView* view = fl_view_new(project); |
gtk_widget_show(GTK_WIDGET(view)); |
||||||
gtk_widget_show(GTK_WIDGET(view)); |
gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view)); |
||||||
gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view)); |
|
||||||
|
fl_register_plugins(FL_PLUGIN_REGISTRY(view)); |
||||||
fl_register_plugins(FL_PLUGIN_REGISTRY(view)); |
|
||||||
|
gtk_widget_grab_focus(GTK_WIDGET(view)); |
||||||
gtk_widget_grab_focus(GTK_WIDGET(view)); |
} |
||||||
} |
|
||||||
|
// Implements GApplication::local_command_line.
|
||||||
// Implements GApplication::local_command_line.
|
static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) { |
||||||
static gboolean my_application_local_command_line(GApplication* application, gchar ***arguments, int *exit_status) { |
MyApplication* self = MY_APPLICATION(application); |
||||||
MyApplication* self = MY_APPLICATION(application); |
// Strip out the first argument as it is the binary name.
|
||||||
// Strip out the first argument as it is the binary name.
|
self->dart_entrypoint_arguments = g_strdupv(*arguments + 1); |
||||||
self->dart_entrypoint_arguments = g_strdupv(*arguments + 1); |
|
||||||
|
g_autoptr(GError) error = nullptr; |
||||||
g_autoptr(GError) error = nullptr; |
if (!g_application_register(application, nullptr, &error)) { |
||||||
if (!g_application_register(application, nullptr, &error)) { |
g_warning("Failed to register: %s", error->message); |
||||||
g_warning("Failed to register: %s", error->message); |
*exit_status = 1; |
||||||
*exit_status = 1; |
return TRUE; |
||||||
return TRUE; |
} |
||||||
} |
|
||||||
|
g_application_activate(application); |
||||||
g_application_activate(application); |
*exit_status = 0; |
||||||
*exit_status = 0; |
|
||||||
|
return TRUE; |
||||||
return TRUE; |
} |
||||||
} |
|
||||||
|
// Implements GObject::dispose.
|
||||||
// Implements GObject::dispose.
|
static void my_application_dispose(GObject* object) { |
||||||
static void my_application_dispose(GObject *object) { |
MyApplication* self = MY_APPLICATION(object); |
||||||
MyApplication* self = MY_APPLICATION(object); |
g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev); |
||||||
g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev); |
G_OBJECT_CLASS(my_application_parent_class)->dispose(object); |
||||||
G_OBJECT_CLASS(my_application_parent_class)->dispose(object); |
} |
||||||
} |
|
||||||
|
static void my_application_class_init(MyApplicationClass* klass) { |
||||||
static void my_application_class_init(MyApplicationClass* klass) { |
G_APPLICATION_CLASS(klass)->activate = my_application_activate; |
||||||
G_APPLICATION_CLASS(klass)->activate = my_application_activate; |
G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line; |
||||||
G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line; |
G_OBJECT_CLASS(klass)->dispose = my_application_dispose; |
||||||
G_OBJECT_CLASS(klass)->dispose = my_application_dispose; |
} |
||||||
} |
|
||||||
|
static void my_application_init(MyApplication* self) {} |
||||||
static void my_application_init(MyApplication* self) {} |
|
||||||
|
MyApplication* my_application_new() { |
||||||
MyApplication* my_application_new() { |
return MY_APPLICATION(g_object_new(my_application_get_type(), |
||||||
return MY_APPLICATION(g_object_new(my_application_get_type(), |
"application-id", APPLICATION_ID, |
||||||
"application-id", APPLICATION_ID, |
"flags", G_APPLICATION_NON_UNIQUE, |
||||||
nullptr)); |
nullptr)); |
||||||
} |
} |
||||||
|
|||||||
@ -1,18 +1,18 @@ |
|||||||
#ifndef FLUTTER_MY_APPLICATION_H_ |
#ifndef FLUTTER_MY_APPLICATION_H_ |
||||||
#define FLUTTER_MY_APPLICATION_H_ |
#define FLUTTER_MY_APPLICATION_H_ |
||||||
|
|
||||||
#include <gtk/gtk.h> |
#include <gtk/gtk.h> |
||||||
|
|
||||||
G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION, |
G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION, |
||||||
GtkApplication) |
GtkApplication) |
||||||
|
|
||||||
/**
|
/**
|
||||||
* my_application_new: |
* my_application_new: |
||||||
* |
* |
||||||
* Creates a new Flutter-based application. |
* Creates a new Flutter-based application. |
||||||
* |
* |
||||||
* Returns: a new #MyApplication. |
* Returns: a new #MyApplication. |
||||||
*/ |
*/ |
||||||
MyApplication* my_application_new(); |
MyApplication* my_application_new(); |
||||||
|
|
||||||
#endif // FLUTTER_MY_APPLICATION_H_
|
#endif // FLUTTER_MY_APPLICATION_H_
|
||||||
|
|||||||
@ -0,0 +1,12 @@ |
|||||||
|
import FlutterMacOS |
||||||
|
import Cocoa |
||||||
|
import XCTest |
||||||
|
|
||||||
|
class RunnerTests: XCTestCase { |
||||||
|
|
||||||
|
func testExample() { |
||||||
|
// If you add code to the Runner application, consider adding tests here. |
||||||
|
// See https://developer.apple.com/documentation/xctest for more information about using XCTest. |
||||||
|
} |
||||||
|
|
||||||
|
} |
||||||
|
After Width: | Height: | Size: 5.5 KiB |
|
After Width: | Height: | Size: 20 KiB |
@ -1,17 +1,17 @@ |
|||||||
flutter/ephemeral/ |
flutter/ephemeral/ |
||||||
|
|
||||||
# Visual Studio user-specific files. |
# Visual Studio user-specific files. |
||||||
*.suo |
*.suo |
||||||
*.user |
*.user |
||||||
*.userosscache |
*.userosscache |
||||||
*.sln.docstates |
*.sln.docstates |
||||||
|
|
||||||
# Visual Studio build-related files. |
# Visual Studio build-related files. |
||||||
x64/ |
x64/ |
||||||
x86/ |
x86/ |
||||||
|
|
||||||
# Visual Studio cache files |
# Visual Studio cache files |
||||||
# files ending in .cache can be ignored |
# files ending in .cache can be ignored |
||||||
*.[Cc]ache |
*.[Cc]ache |
||||||
# but keep track of directories ending in .cache |
# but keep track of directories ending in .cache |
||||||
!*.[Cc]ache/ |
!*.[Cc]ache/ |
||||||
|
|||||||
@ -1,95 +1,102 @@ |
|||||||
cmake_minimum_required(VERSION 3.15) |
# Project-level configuration. |
||||||
project(app LANGUAGES CXX) |
cmake_minimum_required(VERSION 3.14) |
||||||
|
project(example LANGUAGES CXX) |
||||||
set(BINARY_NAME "app") |
|
||||||
|
# The name of the executable created for the application. Change this to change |
||||||
cmake_policy(SET CMP0063 NEW) |
# the on-disk name of your application. |
||||||
|
set(BINARY_NAME "example") |
||||||
set(CMAKE_INSTALL_RPATH "$ORIGIN/lib") |
|
||||||
|
# Explicitly opt in to modern CMake behaviors to avoid warnings with recent |
||||||
# Configure build options. |
# versions of CMake. |
||||||
get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) |
cmake_policy(VERSION 3.14...3.25) |
||||||
if(IS_MULTICONFIG) |
|
||||||
set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release" |
# Define build configuration option. |
||||||
CACHE STRING "" FORCE) |
get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) |
||||||
else() |
if(IS_MULTICONFIG) |
||||||
if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) |
set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release" |
||||||
set(CMAKE_BUILD_TYPE "Debug" CACHE |
CACHE STRING "" FORCE) |
||||||
STRING "Flutter build mode" FORCE) |
else() |
||||||
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS |
if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) |
||||||
"Debug" "Profile" "Release") |
set(CMAKE_BUILD_TYPE "Debug" CACHE |
||||||
endif() |
STRING "Flutter build mode" FORCE) |
||||||
endif() |
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS |
||||||
|
"Debug" "Profile" "Release") |
||||||
set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") |
endif() |
||||||
set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") |
endif() |
||||||
set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}") |
# Define settings for the Profile build mode. |
||||||
set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}") |
set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") |
||||||
|
set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") |
||||||
# Use Unicode for all projects. |
set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}") |
||||||
add_definitions(-DUNICODE -D_UNICODE) |
set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}") |
||||||
|
|
||||||
# Compilation settings that should be applied to most targets. |
# Use Unicode for all projects. |
||||||
function(APPLY_STANDARD_SETTINGS TARGET) |
add_definitions(-DUNICODE -D_UNICODE) |
||||||
target_compile_features(${TARGET} PUBLIC cxx_std_17) |
|
||||||
target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100") |
# Compilation settings that should be applied to most targets. |
||||||
target_compile_options(${TARGET} PRIVATE /EHsc) |
# |
||||||
target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0") |
# Be cautious about adding new options here, as plugins use this function by |
||||||
target_compile_definitions(${TARGET} PRIVATE "$<$<CONFIG:Debug>:_DEBUG>") |
# default. In most cases, you should add new options to specific targets instead |
||||||
endfunction() |
# of modifying this function. |
||||||
|
function(APPLY_STANDARD_SETTINGS TARGET) |
||||||
set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") |
target_compile_features(${TARGET} PUBLIC cxx_std_17) |
||||||
|
target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100") |
||||||
# Flutter library and tool build rules. |
target_compile_options(${TARGET} PRIVATE /EHsc) |
||||||
add_subdirectory(${FLUTTER_MANAGED_DIR}) |
target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0") |
||||||
|
target_compile_definitions(${TARGET} PRIVATE "$<$<CONFIG:Debug>:_DEBUG>") |
||||||
# Application build |
endfunction() |
||||||
add_subdirectory("runner") |
|
||||||
|
# Flutter library and tool build rules. |
||||||
# Generated plugin build rules, which manage building the plugins and adding |
set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") |
||||||
# them to the application. |
add_subdirectory(${FLUTTER_MANAGED_DIR}) |
||||||
include(flutter/generated_plugins.cmake) |
|
||||||
|
# Application build; see runner/CMakeLists.txt. |
||||||
|
add_subdirectory("runner") |
||||||
# === Installation === |
|
||||||
# Support files are copied into place next to the executable, so that it can |
|
||||||
# run in place. This is done instead of making a separate bundle (as on Linux) |
# Generated plugin build rules, which manage building the plugins and adding |
||||||
# so that building and running from within Visual Studio will work. |
# them to the application. |
||||||
set(BUILD_BUNDLE_DIR "$<TARGET_FILE_DIR:${BINARY_NAME}>") |
include(flutter/generated_plugins.cmake) |
||||||
# Make the "install" step default, as it's required to run. |
|
||||||
set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1) |
|
||||||
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) |
# === Installation === |
||||||
set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) |
# Support files are copied into place next to the executable, so that it can |
||||||
endif() |
# run in place. This is done instead of making a separate bundle (as on Linux) |
||||||
|
# so that building and running from within Visual Studio will work. |
||||||
set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") |
set(BUILD_BUNDLE_DIR "$<TARGET_FILE_DIR:${BINARY_NAME}>") |
||||||
set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}") |
# Make the "install" step default, as it's required to run. |
||||||
|
set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1) |
||||||
install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" |
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) |
||||||
COMPONENT Runtime) |
set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) |
||||||
|
endif() |
||||||
install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" |
|
||||||
COMPONENT Runtime) |
set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") |
||||||
|
set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}") |
||||||
install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" |
|
||||||
COMPONENT Runtime) |
install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" |
||||||
|
COMPONENT Runtime) |
||||||
if(PLUGIN_BUNDLED_LIBRARIES) |
|
||||||
install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" |
install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" |
||||||
DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" |
COMPONENT Runtime) |
||||||
COMPONENT Runtime) |
|
||||||
endif() |
install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" |
||||||
|
COMPONENT Runtime) |
||||||
# Fully re-copy the assets directory on each build to avoid having stale files |
|
||||||
# from a previous install. |
if(PLUGIN_BUNDLED_LIBRARIES) |
||||||
set(FLUTTER_ASSET_DIR_NAME "flutter_assets") |
install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" |
||||||
install(CODE " |
DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" |
||||||
file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") |
COMPONENT Runtime) |
||||||
" COMPONENT Runtime) |
endif() |
||||||
install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" |
|
||||||
DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) |
# Fully re-copy the assets directory on each build to avoid having stale files |
||||||
|
# from a previous install. |
||||||
# Install the AOT library on non-Debug builds only. |
set(FLUTTER_ASSET_DIR_NAME "flutter_assets") |
||||||
install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" |
install(CODE " |
||||||
CONFIGURATIONS Profile;Release |
file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") |
||||||
COMPONENT Runtime) |
" COMPONENT Runtime) |
||||||
|
install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" |
||||||
|
DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) |
||||||
|
|
||||||
|
# Install the AOT library on non-Debug builds only. |
||||||
|
install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" |
||||||
|
CONFIGURATIONS Profile;Release |
||||||
|
COMPONENT Runtime) |
||||||
|
|||||||
@ -1,103 +1,104 @@ |
|||||||
cmake_minimum_required(VERSION 3.15) |
# This file controls Flutter-level build steps. It should not be edited. |
||||||
|
cmake_minimum_required(VERSION 3.14) |
||||||
set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") |
|
||||||
|
set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") |
||||||
# Configuration provided via flutter tool. |
|
||||||
include(${EPHEMERAL_DIR}/generated_config.cmake) |
# Configuration provided via flutter tool. |
||||||
|
include(${EPHEMERAL_DIR}/generated_config.cmake) |
||||||
# TODO: Move the rest of this into files in ephemeral. See |
|
||||||
# https://github.com/flutter/flutter/issues/57146. |
# TODO: Move the rest of this into files in ephemeral. See |
||||||
set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") |
# https://github.com/flutter/flutter/issues/57146. |
||||||
|
set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") |
||||||
# === Flutter Library === |
|
||||||
set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") |
# === Flutter Library === |
||||||
|
set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") |
||||||
# Published to parent scope for install step. |
|
||||||
set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) |
# Published to parent scope for install step. |
||||||
set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) |
set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) |
||||||
set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) |
set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) |
||||||
set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE) |
set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) |
||||||
|
set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE) |
||||||
list(APPEND FLUTTER_LIBRARY_HEADERS |
|
||||||
"flutter_export.h" |
list(APPEND FLUTTER_LIBRARY_HEADERS |
||||||
"flutter_windows.h" |
"flutter_export.h" |
||||||
"flutter_messenger.h" |
"flutter_windows.h" |
||||||
"flutter_plugin_registrar.h" |
"flutter_messenger.h" |
||||||
"flutter_texture_registrar.h" |
"flutter_plugin_registrar.h" |
||||||
) |
"flutter_texture_registrar.h" |
||||||
list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/") |
) |
||||||
add_library(flutter INTERFACE) |
list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/") |
||||||
target_include_directories(flutter INTERFACE |
add_library(flutter INTERFACE) |
||||||
"${EPHEMERAL_DIR}" |
target_include_directories(flutter INTERFACE |
||||||
) |
"${EPHEMERAL_DIR}" |
||||||
target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib") |
) |
||||||
add_dependencies(flutter flutter_assemble) |
target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib") |
||||||
|
add_dependencies(flutter flutter_assemble) |
||||||
# === Wrapper === |
|
||||||
list(APPEND CPP_WRAPPER_SOURCES_CORE |
# === Wrapper === |
||||||
"core_implementations.cc" |
list(APPEND CPP_WRAPPER_SOURCES_CORE |
||||||
"standard_codec.cc" |
"core_implementations.cc" |
||||||
) |
"standard_codec.cc" |
||||||
list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/") |
) |
||||||
list(APPEND CPP_WRAPPER_SOURCES_PLUGIN |
list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/") |
||||||
"plugin_registrar.cc" |
list(APPEND CPP_WRAPPER_SOURCES_PLUGIN |
||||||
) |
"plugin_registrar.cc" |
||||||
list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/") |
) |
||||||
list(APPEND CPP_WRAPPER_SOURCES_APP |
list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/") |
||||||
"flutter_engine.cc" |
list(APPEND CPP_WRAPPER_SOURCES_APP |
||||||
"flutter_view_controller.cc" |
"flutter_engine.cc" |
||||||
) |
"flutter_view_controller.cc" |
||||||
list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/") |
) |
||||||
|
list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/") |
||||||
# Wrapper sources needed for a plugin. |
|
||||||
add_library(flutter_wrapper_plugin STATIC |
# Wrapper sources needed for a plugin. |
||||||
${CPP_WRAPPER_SOURCES_CORE} |
add_library(flutter_wrapper_plugin STATIC |
||||||
${CPP_WRAPPER_SOURCES_PLUGIN} |
${CPP_WRAPPER_SOURCES_CORE} |
||||||
) |
${CPP_WRAPPER_SOURCES_PLUGIN} |
||||||
apply_standard_settings(flutter_wrapper_plugin) |
) |
||||||
set_target_properties(flutter_wrapper_plugin PROPERTIES |
apply_standard_settings(flutter_wrapper_plugin) |
||||||
POSITION_INDEPENDENT_CODE ON) |
set_target_properties(flutter_wrapper_plugin PROPERTIES |
||||||
set_target_properties(flutter_wrapper_plugin PROPERTIES |
POSITION_INDEPENDENT_CODE ON) |
||||||
CXX_VISIBILITY_PRESET hidden) |
set_target_properties(flutter_wrapper_plugin PROPERTIES |
||||||
target_link_libraries(flutter_wrapper_plugin PUBLIC flutter) |
CXX_VISIBILITY_PRESET hidden) |
||||||
target_include_directories(flutter_wrapper_plugin PUBLIC |
target_link_libraries(flutter_wrapper_plugin PUBLIC flutter) |
||||||
"${WRAPPER_ROOT}/include" |
target_include_directories(flutter_wrapper_plugin PUBLIC |
||||||
) |
"${WRAPPER_ROOT}/include" |
||||||
add_dependencies(flutter_wrapper_plugin flutter_assemble) |
) |
||||||
|
add_dependencies(flutter_wrapper_plugin flutter_assemble) |
||||||
# Wrapper sources needed for the runner. |
|
||||||
add_library(flutter_wrapper_app STATIC |
# Wrapper sources needed for the runner. |
||||||
${CPP_WRAPPER_SOURCES_CORE} |
add_library(flutter_wrapper_app STATIC |
||||||
${CPP_WRAPPER_SOURCES_APP} |
${CPP_WRAPPER_SOURCES_CORE} |
||||||
) |
${CPP_WRAPPER_SOURCES_APP} |
||||||
apply_standard_settings(flutter_wrapper_app) |
) |
||||||
target_link_libraries(flutter_wrapper_app PUBLIC flutter) |
apply_standard_settings(flutter_wrapper_app) |
||||||
target_include_directories(flutter_wrapper_app PUBLIC |
target_link_libraries(flutter_wrapper_app PUBLIC flutter) |
||||||
"${WRAPPER_ROOT}/include" |
target_include_directories(flutter_wrapper_app PUBLIC |
||||||
) |
"${WRAPPER_ROOT}/include" |
||||||
add_dependencies(flutter_wrapper_app flutter_assemble) |
) |
||||||
|
add_dependencies(flutter_wrapper_app flutter_assemble) |
||||||
# === Flutter tool backend === |
|
||||||
# _phony_ is a non-existent file to force this command to run every time, |
# === Flutter tool backend === |
||||||
# since currently there's no way to get a full input/output list from the |
# _phony_ is a non-existent file to force this command to run every time, |
||||||
# flutter tool. |
# since currently there's no way to get a full input/output list from the |
||||||
set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_") |
# flutter tool. |
||||||
set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE) |
set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_") |
||||||
add_custom_command( |
set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE) |
||||||
OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} |
add_custom_command( |
||||||
${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN} |
OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} |
||||||
${CPP_WRAPPER_SOURCES_APP} |
${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN} |
||||||
${PHONY_OUTPUT} |
${CPP_WRAPPER_SOURCES_APP} |
||||||
COMMAND ${CMAKE_COMMAND} -E env |
${PHONY_OUTPUT} |
||||||
${FLUTTER_TOOL_ENVIRONMENT} |
COMMAND ${CMAKE_COMMAND} -E env |
||||||
"${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" |
${FLUTTER_TOOL_ENVIRONMENT} |
||||||
windows-x64 $<CONFIG> |
"${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" |
||||||
VERBATIM |
windows-x64 $<CONFIG> |
||||||
) |
VERBATIM |
||||||
add_custom_target(flutter_assemble DEPENDS |
) |
||||||
"${FLUTTER_LIBRARY}" |
add_custom_target(flutter_assemble DEPENDS |
||||||
${FLUTTER_LIBRARY_HEADERS} |
"${FLUTTER_LIBRARY}" |
||||||
${CPP_WRAPPER_SOURCES_CORE} |
${FLUTTER_LIBRARY_HEADERS} |
||||||
${CPP_WRAPPER_SOURCES_PLUGIN} |
${CPP_WRAPPER_SOURCES_CORE} |
||||||
${CPP_WRAPPER_SOURCES_APP} |
${CPP_WRAPPER_SOURCES_PLUGIN} |
||||||
) |
${CPP_WRAPPER_SOURCES_APP} |
||||||
|
) |
||||||
|
|||||||
@ -1,18 +1,40 @@ |
|||||||
cmake_minimum_required(VERSION 3.15) |
cmake_minimum_required(VERSION 3.14) |
||||||
project(runner LANGUAGES CXX) |
project(runner LANGUAGES CXX) |
||||||
|
|
||||||
add_executable(${BINARY_NAME} WIN32 |
# Define the application target. To change its name, change BINARY_NAME in the |
||||||
"flutter_window.cpp" |
# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer |
||||||
"main.cpp" |
# work. |
||||||
"run_loop.cpp" |
# |
||||||
"utils.cpp" |
# Any new source files that you add to the application should be added here. |
||||||
"win32_window.cpp" |
add_executable(${BINARY_NAME} WIN32 |
||||||
"${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" |
"flutter_window.cpp" |
||||||
"Runner.rc" |
"main.cpp" |
||||||
"runner.exe.manifest" |
"utils.cpp" |
||||||
) |
"win32_window.cpp" |
||||||
apply_standard_settings(${BINARY_NAME}) |
"${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" |
||||||
target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") |
"Runner.rc" |
||||||
target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app) |
"runner.exe.manifest" |
||||||
target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") |
) |
||||||
add_dependencies(${BINARY_NAME} flutter_assemble) |
|
||||||
|
# Apply the standard set of build settings. This can be removed for applications |
||||||
|
# that need different build settings. |
||||||
|
apply_standard_settings(${BINARY_NAME}) |
||||||
|
|
||||||
|
# Add preprocessor definitions for the build version. |
||||||
|
target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"") |
||||||
|
target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}") |
||||||
|
target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}") |
||||||
|
target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}") |
||||||
|
target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}") |
||||||
|
|
||||||
|
# Disable Windows macros that collide with C++ standard library functions. |
||||||
|
target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") |
||||||
|
|
||||||
|
# Add dependency libraries and include directories. Add any application-specific |
||||||
|
# dependencies here. |
||||||
|
target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app) |
||||||
|
target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib") |
||||||
|
target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") |
||||||
|
|
||||||
|
# Run the Flutter tool portions of the build. This must not be removed. |
||||||
|
add_dependencies(${BINARY_NAME} flutter_assemble) |
||||||
|
|||||||
@ -1,121 +1,121 @@ |
|||||||
// Microsoft Visual C++ generated resource script. |
// Microsoft Visual C++ generated resource script. |
||||||
// |
// |
||||||
#pragma code_page(65001) |
#pragma code_page(65001) |
||||||
#include "resource.h" |
#include "resource.h" |
||||||
|
|
||||||
#define APSTUDIO_READONLY_SYMBOLS |
#define APSTUDIO_READONLY_SYMBOLS |
||||||
///////////////////////////////////////////////////////////////////////////// |
///////////////////////////////////////////////////////////////////////////// |
||||||
// |
// |
||||||
// Generated from the TEXTINCLUDE 2 resource. |
// Generated from the TEXTINCLUDE 2 resource. |
||||||
// |
// |
||||||
#include "winres.h" |
#include "winres.h" |
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////// |
///////////////////////////////////////////////////////////////////////////// |
||||||
#undef APSTUDIO_READONLY_SYMBOLS |
#undef APSTUDIO_READONLY_SYMBOLS |
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////// |
///////////////////////////////////////////////////////////////////////////// |
||||||
// English (United States) resources |
// English (United States) resources |
||||||
|
|
||||||
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) |
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) |
||||||
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US |
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US |
||||||
|
|
||||||
#ifdef APSTUDIO_INVOKED |
#ifdef APSTUDIO_INVOKED |
||||||
///////////////////////////////////////////////////////////////////////////// |
///////////////////////////////////////////////////////////////////////////// |
||||||
// |
// |
||||||
// TEXTINCLUDE |
// TEXTINCLUDE |
||||||
// |
// |
||||||
|
|
||||||
1 TEXTINCLUDE |
1 TEXTINCLUDE |
||||||
BEGIN |
BEGIN |
||||||
"resource.h\0" |
"resource.h\0" |
||||||
END |
END |
||||||
|
|
||||||
2 TEXTINCLUDE |
2 TEXTINCLUDE |
||||||
BEGIN |
BEGIN |
||||||
"#include ""winres.h""\r\n" |
"#include ""winres.h""\r\n" |
||||||
"\0" |
"\0" |
||||||
END |
END |
||||||
|
|
||||||
3 TEXTINCLUDE |
3 TEXTINCLUDE |
||||||
BEGIN |
BEGIN |
||||||
"\r\n" |
"\r\n" |
||||||
"\0" |
"\0" |
||||||
END |
END |
||||||
|
|
||||||
#endif // APSTUDIO_INVOKED |
#endif // APSTUDIO_INVOKED |
||||||
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////// |
///////////////////////////////////////////////////////////////////////////// |
||||||
// |
// |
||||||
// Icon |
// Icon |
||||||
// |
// |
||||||
|
|
||||||
// Icon with lowest ID value placed first to ensure application icon |
// Icon with lowest ID value placed first to ensure application icon |
||||||
// remains consistent on all systems. |
// remains consistent on all systems. |
||||||
IDI_APP_ICON ICON "resources\\app_icon.ico" |
IDI_APP_ICON ICON "resources\\app_icon.ico" |
||||||
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////// |
///////////////////////////////////////////////////////////////////////////// |
||||||
// |
// |
||||||
// Version |
// Version |
||||||
// |
// |
||||||
|
|
||||||
#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) |
#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) |
||||||
#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD |
#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD |
||||||
#else |
#else |
||||||
#define VERSION_AS_NUMBER 1,0,0,0 |
#define VERSION_AS_NUMBER 1,0,0,0 |
||||||
#endif |
#endif |
||||||
|
|
||||||
#if defined(FLUTTER_VERSION) |
#if defined(FLUTTER_VERSION) |
||||||
#define VERSION_AS_STRING FLUTTER_VERSION |
#define VERSION_AS_STRING FLUTTER_VERSION |
||||||
#else |
#else |
||||||
#define VERSION_AS_STRING "1.0.0" |
#define VERSION_AS_STRING "1.0.0" |
||||||
#endif |
#endif |
||||||
|
|
||||||
VS_VERSION_INFO VERSIONINFO |
VS_VERSION_INFO VERSIONINFO |
||||||
FILEVERSION VERSION_AS_NUMBER |
FILEVERSION VERSION_AS_NUMBER |
||||||
PRODUCTVERSION VERSION_AS_NUMBER |
PRODUCTVERSION VERSION_AS_NUMBER |
||||||
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK |
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK |
||||||
#ifdef _DEBUG |
#ifdef _DEBUG |
||||||
FILEFLAGS VS_FF_DEBUG |
FILEFLAGS VS_FF_DEBUG |
||||||
#else |
#else |
||||||
FILEFLAGS 0x0L |
FILEFLAGS 0x0L |
||||||
#endif |
#endif |
||||||
FILEOS VOS__WINDOWS32 |
FILEOS VOS__WINDOWS32 |
||||||
FILETYPE VFT_APP |
FILETYPE VFT_APP |
||||||
FILESUBTYPE 0x0L |
FILESUBTYPE 0x0L |
||||||
BEGIN |
BEGIN |
||||||
BLOCK "StringFileInfo" |
BLOCK "StringFileInfo" |
||||||
BEGIN |
BEGIN |
||||||
BLOCK "040904e4" |
BLOCK "040904e4" |
||||||
BEGIN |
BEGIN |
||||||
VALUE "CompanyName", "com.example" "\0" |
VALUE "CompanyName", "com.example" "\0" |
||||||
VALUE "FileDescription", "A new Flutter project." "\0" |
VALUE "FileDescription", "example" "\0" |
||||||
VALUE "FileVersion", VERSION_AS_STRING "\0" |
VALUE "FileVersion", VERSION_AS_STRING "\0" |
||||||
VALUE "InternalName", "app" "\0" |
VALUE "InternalName", "example" "\0" |
||||||
VALUE "LegalCopyright", "Copyright (C) 2021 com.example. All rights reserved." "\0" |
VALUE "LegalCopyright", "Copyright (C) 2023 com.example. All rights reserved." "\0" |
||||||
VALUE "OriginalFilename", "app.exe" "\0" |
VALUE "OriginalFilename", "example.exe" "\0" |
||||||
VALUE "ProductName", "app" "\0" |
VALUE "ProductName", "example" "\0" |
||||||
VALUE "ProductVersion", VERSION_AS_STRING "\0" |
VALUE "ProductVersion", VERSION_AS_STRING "\0" |
||||||
END |
END |
||||||
END |
END |
||||||
BLOCK "VarFileInfo" |
BLOCK "VarFileInfo" |
||||||
BEGIN |
BEGIN |
||||||
VALUE "Translation", 0x409, 1252 |
VALUE "Translation", 0x409, 1252 |
||||||
END |
END |
||||||
END |
END |
||||||
|
|
||||||
#endif // English (United States) resources |
#endif // English (United States) resources |
||||||
///////////////////////////////////////////////////////////////////////////// |
///////////////////////////////////////////////////////////////////////////// |
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef APSTUDIO_INVOKED |
#ifndef APSTUDIO_INVOKED |
||||||
///////////////////////////////////////////////////////////////////////////// |
///////////////////////////////////////////////////////////////////////////// |
||||||
// |
// |
||||||
// Generated from the TEXTINCLUDE 3 resource. |
// Generated from the TEXTINCLUDE 3 resource. |
||||||
// |
// |
||||||
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////// |
///////////////////////////////////////////////////////////////////////////// |
||||||
#endif // not APSTUDIO_INVOKED |
#endif // not APSTUDIO_INVOKED |
||||||
|
|||||||
@ -1,64 +1,71 @@ |
|||||||
#include "flutter_window.h" |
#include "flutter_window.h" |
||||||
|
|
||||||
#include <optional> |
#include <optional> |
||||||
|
|
||||||
#include "flutter/generated_plugin_registrant.h" |
#include "flutter/generated_plugin_registrant.h" |
||||||
|
|
||||||
FlutterWindow::FlutterWindow(RunLoop* run_loop, |
FlutterWindow::FlutterWindow(const flutter::DartProject& project) |
||||||
const flutter::DartProject& project) |
: project_(project) {} |
||||||
: run_loop_(run_loop), project_(project) {} |
|
||||||
|
FlutterWindow::~FlutterWindow() {} |
||||||
FlutterWindow::~FlutterWindow() {} |
|
||||||
|
bool FlutterWindow::OnCreate() { |
||||||
bool FlutterWindow::OnCreate() { |
if (!Win32Window::OnCreate()) { |
||||||
if (!Win32Window::OnCreate()) { |
return false; |
||||||
return false; |
} |
||||||
} |
|
||||||
|
RECT frame = GetClientArea(); |
||||||
RECT frame = GetClientArea(); |
|
||||||
|
// The size here must match the window dimensions to avoid unnecessary surface
|
||||||
// The size here must match the window dimensions to avoid unnecessary surface
|
// creation / destruction in the startup path.
|
||||||
// creation / destruction in the startup path.
|
flutter_controller_ = std::make_unique<flutter::FlutterViewController>( |
||||||
flutter_controller_ = std::make_unique<flutter::FlutterViewController>( |
frame.right - frame.left, frame.bottom - frame.top, project_); |
||||||
frame.right - frame.left, frame.bottom - frame.top, project_); |
// Ensure that basic setup of the controller was successful.
|
||||||
// Ensure that basic setup of the controller was successful.
|
if (!flutter_controller_->engine() || !flutter_controller_->view()) { |
||||||
if (!flutter_controller_->engine() || !flutter_controller_->view()) { |
return false; |
||||||
return false; |
} |
||||||
} |
RegisterPlugins(flutter_controller_->engine()); |
||||||
RegisterPlugins(flutter_controller_->engine()); |
SetChildContent(flutter_controller_->view()->GetNativeWindow()); |
||||||
run_loop_->RegisterFlutterInstance(flutter_controller_->engine()); |
|
||||||
SetChildContent(flutter_controller_->view()->GetNativeWindow()); |
flutter_controller_->engine()->SetNextFrameCallback([&]() { |
||||||
return true; |
this->Show(); |
||||||
} |
}); |
||||||
|
|
||||||
void FlutterWindow::OnDestroy() { |
// Flutter can complete the first frame before the "show window" callback is
|
||||||
if (flutter_controller_) { |
// registered. The following call ensures a frame is pending to ensure the
|
||||||
run_loop_->UnregisterFlutterInstance(flutter_controller_->engine()); |
// window is shown. It is a no-op if the first frame hasn't completed yet.
|
||||||
flutter_controller_ = nullptr; |
flutter_controller_->ForceRedraw(); |
||||||
} |
|
||||||
|
return true; |
||||||
Win32Window::OnDestroy(); |
} |
||||||
} |
|
||||||
|
void FlutterWindow::OnDestroy() { |
||||||
LRESULT |
if (flutter_controller_) { |
||||||
FlutterWindow::MessageHandler(HWND hwnd, UINT const message, |
flutter_controller_ = nullptr; |
||||||
WPARAM const wparam, |
} |
||||||
LPARAM const lparam) noexcept { |
|
||||||
// Give Flutter, including plugins, an opporutunity to handle window messages.
|
Win32Window::OnDestroy(); |
||||||
if (flutter_controller_) { |
} |
||||||
std::optional<LRESULT> result = |
|
||||||
flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam, |
LRESULT |
||||||
lparam); |
FlutterWindow::MessageHandler(HWND hwnd, UINT const message, |
||||||
if (result) { |
WPARAM const wparam, |
||||||
return *result; |
LPARAM const lparam) noexcept { |
||||||
} |
// Give Flutter, including plugins, an opportunity to handle window messages.
|
||||||
} |
if (flutter_controller_) { |
||||||
|
std::optional<LRESULT> result = |
||||||
switch (message) { |
flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam, |
||||||
case WM_FONTCHANGE: |
lparam); |
||||||
flutter_controller_->engine()->ReloadSystemFonts(); |
if (result) { |
||||||
break; |
return *result; |
||||||
} |
} |
||||||
|
} |
||||||
return Win32Window::MessageHandler(hwnd, message, wparam, lparam); |
|
||||||
} |
switch (message) { |
||||||
|
case WM_FONTCHANGE: |
||||||
|
flutter_controller_->engine()->ReloadSystemFonts(); |
||||||
|
break; |
||||||
|
} |
||||||
|
|
||||||
|
return Win32Window::MessageHandler(hwnd, message, wparam, lparam); |
||||||
|
} |
||||||
|
|||||||
@ -1,39 +1,33 @@ |
|||||||
#ifndef RUNNER_FLUTTER_WINDOW_H_ |
#ifndef RUNNER_FLUTTER_WINDOW_H_ |
||||||
#define RUNNER_FLUTTER_WINDOW_H_ |
#define RUNNER_FLUTTER_WINDOW_H_ |
||||||
|
|
||||||
#include <flutter/dart_project.h> |
#include <flutter/dart_project.h> |
||||||
#include <flutter/flutter_view_controller.h> |
#include <flutter/flutter_view_controller.h> |
||||||
|
|
||||||
#include <memory> |
#include <memory> |
||||||
|
|
||||||
#include "run_loop.h" |
#include "win32_window.h" |
||||||
#include "win32_window.h" |
|
||||||
|
// A window that does nothing but host a Flutter view.
|
||||||
// A window that does nothing but host a Flutter view.
|
class FlutterWindow : public Win32Window { |
||||||
class FlutterWindow : public Win32Window { |
public: |
||||||
public: |
// Creates a new FlutterWindow hosting a Flutter view running |project|.
|
||||||
// Creates a new FlutterWindow driven by the |run_loop|, hosting a
|
explicit FlutterWindow(const flutter::DartProject& project); |
||||||
// Flutter view running |project|.
|
virtual ~FlutterWindow(); |
||||||
explicit FlutterWindow(RunLoop* run_loop, |
|
||||||
const flutter::DartProject& project); |
protected: |
||||||
virtual ~FlutterWindow(); |
// Win32Window:
|
||||||
|
bool OnCreate() override; |
||||||
protected: |
void OnDestroy() override; |
||||||
// Win32Window:
|
LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam, |
||||||
bool OnCreate() override; |
LPARAM const lparam) noexcept override; |
||||||
void OnDestroy() override; |
|
||||||
LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam, |
private: |
||||||
LPARAM const lparam) noexcept override; |
// The project to run.
|
||||||
|
flutter::DartProject project_; |
||||||
private: |
|
||||||
// The run loop driving events for this window.
|
// The Flutter instance hosted by this window.
|
||||||
RunLoop* run_loop_; |
std::unique_ptr<flutter::FlutterViewController> flutter_controller_; |
||||||
|
}; |
||||||
// The project to run.
|
|
||||||
flutter::DartProject project_; |
#endif // RUNNER_FLUTTER_WINDOW_H_
|
||||||
|
|
||||||
// The Flutter instance hosted by this window.
|
|
||||||
std::unique_ptr<flutter::FlutterViewController> flutter_controller_; |
|
||||||
}; |
|
||||||
|
|
||||||
#endif // RUNNER_FLUTTER_WINDOW_H_
|
|
||||||
|
|||||||
@ -1,42 +1,43 @@ |
|||||||
#include <flutter/dart_project.h> |
#include <flutter/dart_project.h> |
||||||
#include <flutter/flutter_view_controller.h> |
#include <flutter/flutter_view_controller.h> |
||||||
#include <windows.h> |
#include <windows.h> |
||||||
|
|
||||||
#include "flutter_window.h" |
#include "flutter_window.h" |
||||||
#include "run_loop.h" |
#include "utils.h" |
||||||
#include "utils.h" |
|
||||||
|
int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, |
||||||
int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, |
_In_ wchar_t *command_line, _In_ int show_command) { |
||||||
_In_ wchar_t *command_line, _In_ int show_command) { |
// Attach to console when present (e.g., 'flutter run') or create a
|
||||||
// Attach to console when present (e.g., 'flutter run') or create a
|
// new console when running with a debugger.
|
||||||
// new console when running with a debugger.
|
if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { |
||||||
if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { |
CreateAndAttachConsole(); |
||||||
CreateAndAttachConsole(); |
} |
||||||
} |
|
||||||
|
// Initialize COM, so that it is available for use in the library and/or
|
||||||
// Initialize COM, so that it is available for use in the library and/or
|
// plugins.
|
||||||
// plugins.
|
::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); |
||||||
::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); |
|
||||||
|
flutter::DartProject project(L"data"); |
||||||
RunLoop run_loop; |
|
||||||
|
std::vector<std::string> command_line_arguments = |
||||||
flutter::DartProject project(L"data"); |
GetCommandLineArguments(); |
||||||
|
|
||||||
std::vector<std::string> command_line_arguments = |
project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); |
||||||
GetCommandLineArguments(); |
|
||||||
|
FlutterWindow window(project); |
||||||
project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); |
Win32Window::Point origin(10, 10); |
||||||
|
Win32Window::Size size(1280, 720); |
||||||
FlutterWindow window(&run_loop, project); |
if (!window.Create(L"example", origin, size)) { |
||||||
Win32Window::Point origin(10, 10); |
return EXIT_FAILURE; |
||||||
Win32Window::Size size(1280, 720); |
} |
||||||
if (!window.CreateAndShow(L"app", origin, size)) { |
window.SetQuitOnClose(true); |
||||||
return EXIT_FAILURE; |
|
||||||
} |
::MSG msg; |
||||||
window.SetQuitOnClose(true); |
while (::GetMessage(&msg, nullptr, 0, 0)) { |
||||||
|
::TranslateMessage(&msg); |
||||||
run_loop.Run(); |
::DispatchMessage(&msg); |
||||||
|
} |
||||||
::CoUninitialize(); |
|
||||||
return EXIT_SUCCESS; |
::CoUninitialize(); |
||||||
} |
return EXIT_SUCCESS; |
||||||
|
} |
||||||
|
|||||||
@ -1,16 +1,16 @@ |
|||||||
//{{NO_DEPENDENCIES}}
|
//{{NO_DEPENDENCIES}}
|
||||||
// Microsoft Visual C++ generated include file.
|
// Microsoft Visual C++ generated include file.
|
||||||
// Used by Runner.rc
|
// Used by Runner.rc
|
||||||
//
|
//
|
||||||
#define IDI_APP_ICON 101 |
#define IDI_APP_ICON 101 |
||||||
|
|
||||||
// Next default values for new objects
|
// Next default values for new objects
|
||||||
//
|
//
|
||||||
#ifdef APSTUDIO_INVOKED |
#ifdef APSTUDIO_INVOKED |
||||||
#ifndef APSTUDIO_READONLY_SYMBOLS |
#ifndef APSTUDIO_READONLY_SYMBOLS |
||||||
#define _APS_NEXT_RESOURCE_VALUE 102 |
#define _APS_NEXT_RESOURCE_VALUE 102 |
||||||
#define _APS_NEXT_COMMAND_VALUE 40001 |
#define _APS_NEXT_COMMAND_VALUE 40001 |
||||||
#define _APS_NEXT_CONTROL_VALUE 1001 |
#define _APS_NEXT_CONTROL_VALUE 1001 |
||||||
#define _APS_NEXT_SYMED_VALUE 101 |
#define _APS_NEXT_SYMED_VALUE 101 |
||||||
#endif |
#endif |
||||||
#endif |
#endif |
||||||
|
|||||||
@ -1,66 +0,0 @@ |
|||||||
#include "run_loop.h" |
|
||||||
|
|
||||||
#include <windows.h> |
|
||||||
|
|
||||||
#include <algorithm> |
|
||||||
|
|
||||||
RunLoop::RunLoop() {} |
|
||||||
|
|
||||||
RunLoop::~RunLoop() {} |
|
||||||
|
|
||||||
void RunLoop::Run() { |
|
||||||
bool keep_running = true; |
|
||||||
TimePoint next_flutter_event_time = TimePoint::clock::now(); |
|
||||||
while (keep_running) { |
|
||||||
std::chrono::nanoseconds wait_duration = |
|
||||||
std::max(std::chrono::nanoseconds(0), |
|
||||||
next_flutter_event_time - TimePoint::clock::now()); |
|
||||||
::MsgWaitForMultipleObjects( |
|
||||||
0, nullptr, FALSE, static_cast<DWORD>(wait_duration.count() / 1000), |
|
||||||
QS_ALLINPUT); |
|
||||||
bool processed_events = false; |
|
||||||
MSG message; |
|
||||||
// All pending Windows messages must be processed; MsgWaitForMultipleObjects
|
|
||||||
// won't return again for items left in the queue after PeekMessage.
|
|
||||||
while (::PeekMessage(&message, nullptr, 0, 0, PM_REMOVE)) { |
|
||||||
processed_events = true; |
|
||||||
if (message.message == WM_QUIT) { |
|
||||||
keep_running = false; |
|
||||||
break; |
|
||||||
} |
|
||||||
::TranslateMessage(&message); |
|
||||||
::DispatchMessage(&message); |
|
||||||
// Allow Flutter to process messages each time a Windows message is
|
|
||||||
// processed, to prevent starvation.
|
|
||||||
next_flutter_event_time = |
|
||||||
std::min(next_flutter_event_time, ProcessFlutterMessages()); |
|
||||||
} |
|
||||||
// If the PeekMessage loop didn't run, process Flutter messages.
|
|
||||||
if (!processed_events) { |
|
||||||
next_flutter_event_time = |
|
||||||
std::min(next_flutter_event_time, ProcessFlutterMessages()); |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
void RunLoop::RegisterFlutterInstance( |
|
||||||
flutter::FlutterEngine* flutter_instance) { |
|
||||||
flutter_instances_.insert(flutter_instance); |
|
||||||
} |
|
||||||
|
|
||||||
void RunLoop::UnregisterFlutterInstance( |
|
||||||
flutter::FlutterEngine* flutter_instance) { |
|
||||||
flutter_instances_.erase(flutter_instance); |
|
||||||
} |
|
||||||
|
|
||||||
RunLoop::TimePoint RunLoop::ProcessFlutterMessages() { |
|
||||||
TimePoint next_event_time = TimePoint::max(); |
|
||||||
for (auto instance : flutter_instances_) { |
|
||||||
std::chrono::nanoseconds wait_duration = instance->ProcessMessages(); |
|
||||||
if (wait_duration != std::chrono::nanoseconds::max()) { |
|
||||||
next_event_time = |
|
||||||
std::min(next_event_time, TimePoint::clock::now() + wait_duration); |
|
||||||
} |
|
||||||
} |
|
||||||
return next_event_time; |
|
||||||
} |
|
||||||
@ -1,40 +0,0 @@ |
|||||||
#ifndef RUNNER_RUN_LOOP_H_ |
|
||||||
#define RUNNER_RUN_LOOP_H_ |
|
||||||
|
|
||||||
#include <flutter/flutter_engine.h> |
|
||||||
|
|
||||||
#include <chrono> |
|
||||||
#include <set> |
|
||||||
|
|
||||||
// A runloop that will service events for Flutter instances as well
|
|
||||||
// as native messages.
|
|
||||||
class RunLoop { |
|
||||||
public: |
|
||||||
RunLoop(); |
|
||||||
~RunLoop(); |
|
||||||
|
|
||||||
// Prevent copying
|
|
||||||
RunLoop(RunLoop const&) = delete; |
|
||||||
RunLoop& operator=(RunLoop const&) = delete; |
|
||||||
|
|
||||||
// Runs the run loop until the application quits.
|
|
||||||
void Run(); |
|
||||||
|
|
||||||
// Registers the given Flutter instance for event servicing.
|
|
||||||
void RegisterFlutterInstance( |
|
||||||
flutter::FlutterEngine* flutter_instance); |
|
||||||
|
|
||||||
// Unregisters the given Flutter instance from event servicing.
|
|
||||||
void UnregisterFlutterInstance( |
|
||||||
flutter::FlutterEngine* flutter_instance); |
|
||||||
|
|
||||||
private: |
|
||||||
using TimePoint = std::chrono::steady_clock::time_point; |
|
||||||
|
|
||||||
// Processes all currently pending messages for registered Flutter instances.
|
|
||||||
TimePoint ProcessFlutterMessages(); |
|
||||||
|
|
||||||
std::set<flutter::FlutterEngine*> flutter_instances_; |
|
||||||
}; |
|
||||||
|
|
||||||
#endif // RUNNER_RUN_LOOP_H_
|
|
||||||
@ -1,20 +1,20 @@ |
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> |
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> |
||||||
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> |
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> |
||||||
<application xmlns="urn:schemas-microsoft-com:asm.v3"> |
<application xmlns="urn:schemas-microsoft-com:asm.v3"> |
||||||
<windowsSettings> |
<windowsSettings> |
||||||
<dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness> |
<dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness> |
||||||
</windowsSettings> |
</windowsSettings> |
||||||
</application> |
</application> |
||||||
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> |
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> |
||||||
<application> |
<application> |
||||||
<!-- Windows 10 --> |
<!-- Windows 10 and Windows 11 --> |
||||||
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> |
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> |
||||||
<!-- Windows 8.1 --> |
<!-- Windows 8.1 --> |
||||||
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> |
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> |
||||||
<!-- Windows 8 --> |
<!-- Windows 8 --> |
||||||
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> |
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> |
||||||
<!-- Windows 7 --> |
<!-- Windows 7 --> |
||||||
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> |
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> |
||||||
</application> |
</application> |
||||||
</compatibility> |
</compatibility> |
||||||
</assembly> |
</assembly> |
||||||
|
|||||||
@ -1,64 +1,65 @@ |
|||||||
#include "utils.h" |
#include "utils.h" |
||||||
|
|
||||||
#include <flutter_windows.h> |
#include <flutter_windows.h> |
||||||
#include <io.h> |
#include <io.h> |
||||||
#include <stdio.h> |
#include <stdio.h> |
||||||
#include <windows.h> |
#include <windows.h> |
||||||
|
|
||||||
#include <iostream> |
#include <iostream> |
||||||
|
|
||||||
void CreateAndAttachConsole() { |
void CreateAndAttachConsole() { |
||||||
if (::AllocConsole()) { |
if (::AllocConsole()) { |
||||||
FILE *unused; |
FILE *unused; |
||||||
if (freopen_s(&unused, "CONOUT$", "w", stdout)) { |
if (freopen_s(&unused, "CONOUT$", "w", stdout)) { |
||||||
_dup2(_fileno(stdout), 1); |
_dup2(_fileno(stdout), 1); |
||||||
} |
} |
||||||
if (freopen_s(&unused, "CONOUT$", "w", stderr)) { |
if (freopen_s(&unused, "CONOUT$", "w", stderr)) { |
||||||
_dup2(_fileno(stdout), 2); |
_dup2(_fileno(stdout), 2); |
||||||
} |
} |
||||||
std::ios::sync_with_stdio(); |
std::ios::sync_with_stdio(); |
||||||
FlutterDesktopResyncOutputStreams(); |
FlutterDesktopResyncOutputStreams(); |
||||||
} |
} |
||||||
} |
} |
||||||
|
|
||||||
std::vector<std::string> GetCommandLineArguments() { |
std::vector<std::string> GetCommandLineArguments() { |
||||||
// Convert the UTF-16 command line arguments to UTF-8 for the Engine to use.
|
// Convert the UTF-16 command line arguments to UTF-8 for the Engine to use.
|
||||||
int argc; |
int argc; |
||||||
wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc); |
wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc); |
||||||
if (argv == nullptr) { |
if (argv == nullptr) { |
||||||
return std::vector<std::string>(); |
return std::vector<std::string>(); |
||||||
} |
} |
||||||
|
|
||||||
std::vector<std::string> command_line_arguments; |
std::vector<std::string> command_line_arguments; |
||||||
|
|
||||||
// Skip the first argument as it's the binary name.
|
// Skip the first argument as it's the binary name.
|
||||||
for (int i = 1; i < argc; i++) { |
for (int i = 1; i < argc; i++) { |
||||||
command_line_arguments.push_back(Utf8FromUtf16(argv[i])); |
command_line_arguments.push_back(Utf8FromUtf16(argv[i])); |
||||||
} |
} |
||||||
|
|
||||||
::LocalFree(argv); |
::LocalFree(argv); |
||||||
|
|
||||||
return command_line_arguments; |
return command_line_arguments; |
||||||
} |
} |
||||||
|
|
||||||
std::string Utf8FromUtf16(const wchar_t* utf16_string) { |
std::string Utf8FromUtf16(const wchar_t* utf16_string) { |
||||||
if (utf16_string == nullptr) { |
if (utf16_string == nullptr) { |
||||||
return std::string(); |
return std::string(); |
||||||
} |
} |
||||||
int target_length = ::WideCharToMultiByte( |
int target_length = ::WideCharToMultiByte( |
||||||
CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, |
CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, |
||||||
-1, nullptr, 0, nullptr, nullptr); |
-1, nullptr, 0, nullptr, nullptr) |
||||||
if (target_length == 0) { |
-1; // remove the trailing null character
|
||||||
return std::string(); |
int input_length = (int)wcslen(utf16_string); |
||||||
} |
std::string utf8_string; |
||||||
std::string utf8_string; |
if (target_length <= 0 || target_length > utf8_string.max_size()) { |
||||||
utf8_string.resize(target_length); |
return utf8_string; |
||||||
int converted_length = ::WideCharToMultiByte( |
} |
||||||
CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, |
utf8_string.resize(target_length); |
||||||
-1, utf8_string.data(), |
int converted_length = ::WideCharToMultiByte( |
||||||
target_length, nullptr, nullptr); |
CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, |
||||||
if (converted_length == 0) { |
input_length, utf8_string.data(), target_length, nullptr, nullptr); |
||||||
return std::string(); |
if (converted_length == 0) { |
||||||
} |
return std::string(); |
||||||
return utf8_string; |
} |
||||||
} |
return utf8_string; |
||||||
|
} |
||||||
|
|||||||
@ -1,19 +1,19 @@ |
|||||||
#ifndef RUNNER_UTILS_H_ |
#ifndef RUNNER_UTILS_H_ |
||||||
#define RUNNER_UTILS_H_ |
#define RUNNER_UTILS_H_ |
||||||
|
|
||||||
#include <string> |
#include <string> |
||||||
#include <vector> |
#include <vector> |
||||||
|
|
||||||
// Creates a console for the process, and redirects stdout and stderr to
|
// Creates a console for the process, and redirects stdout and stderr to
|
||||||
// it for both the runner and the Flutter library.
|
// it for both the runner and the Flutter library.
|
||||||
void CreateAndAttachConsole(); |
void CreateAndAttachConsole(); |
||||||
|
|
||||||
// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string
|
// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string
|
||||||
// encoded in UTF-8. Returns an empty std::string on failure.
|
// encoded in UTF-8. Returns an empty std::string on failure.
|
||||||
std::string Utf8FromUtf16(const wchar_t* utf16_string); |
std::string Utf8FromUtf16(const wchar_t* utf16_string); |
||||||
|
|
||||||
// Gets the command line arguments passed in as a std::vector<std::string>,
|
// Gets the command line arguments passed in as a std::vector<std::string>,
|
||||||
// encoded in UTF-8. Returns an empty std::vector<std::string> on failure.
|
// encoded in UTF-8. Returns an empty std::vector<std::string> on failure.
|
||||||
std::vector<std::string> GetCommandLineArguments(); |
std::vector<std::string> GetCommandLineArguments(); |
||||||
|
|
||||||
#endif // RUNNER_UTILS_H_
|
#endif // RUNNER_UTILS_H_
|
||||||
|
|||||||
@ -1,245 +1,288 @@ |
|||||||
#include "win32_window.h" |
#include "win32_window.h" |
||||||
|
|
||||||
#include <flutter_windows.h> |
#include <dwmapi.h> |
||||||
|
#include <flutter_windows.h> |
||||||
#include "resource.h" |
|
||||||
|
#include "resource.h" |
||||||
namespace { |
|
||||||
|
namespace { |
||||||
constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW"; |
|
||||||
|
/// Window attribute that enables dark mode window decorations.
|
||||||
// The number of Win32Window objects that currently exist.
|
///
|
||||||
static int g_active_window_count = 0; |
/// Redefined in case the developer's machine has a Windows SDK older than
|
||||||
|
/// version 10.0.22000.0.
|
||||||
using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd); |
/// See: https://docs.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute
|
||||||
|
#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE |
||||||
// Scale helper to convert logical scaler values to physical using passed in
|
#define DWMWA_USE_IMMERSIVE_DARK_MODE 20 |
||||||
// scale factor
|
#endif |
||||||
int Scale(int source, double scale_factor) { |
|
||||||
return static_cast<int>(source * scale_factor); |
constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW"; |
||||||
} |
|
||||||
|
/// Registry key for app theme preference.
|
||||||
// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module.
|
///
|
||||||
// This API is only needed for PerMonitor V1 awareness mode.
|
/// A value of 0 indicates apps should use dark mode. A non-zero or missing
|
||||||
void EnableFullDpiSupportIfAvailable(HWND hwnd) { |
/// value indicates apps should use light mode.
|
||||||
HMODULE user32_module = LoadLibraryA("User32.dll"); |
constexpr const wchar_t kGetPreferredBrightnessRegKey[] = |
||||||
if (!user32_module) { |
L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"; |
||||||
return; |
constexpr const wchar_t kGetPreferredBrightnessRegValue[] = L"AppsUseLightTheme"; |
||||||
} |
|
||||||
auto enable_non_client_dpi_scaling = |
// The number of Win32Window objects that currently exist.
|
||||||
reinterpret_cast<EnableNonClientDpiScaling*>( |
static int g_active_window_count = 0; |
||||||
GetProcAddress(user32_module, "EnableNonClientDpiScaling")); |
|
||||||
if (enable_non_client_dpi_scaling != nullptr) { |
using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd); |
||||||
enable_non_client_dpi_scaling(hwnd); |
|
||||||
FreeLibrary(user32_module); |
// Scale helper to convert logical scaler values to physical using passed in
|
||||||
} |
// scale factor
|
||||||
} |
int Scale(int source, double scale_factor) { |
||||||
|
return static_cast<int>(source * scale_factor); |
||||||
} // namespace
|
} |
||||||
|
|
||||||
// Manages the Win32Window's window class registration.
|
// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module.
|
||||||
class WindowClassRegistrar { |
// This API is only needed for PerMonitor V1 awareness mode.
|
||||||
public: |
void EnableFullDpiSupportIfAvailable(HWND hwnd) { |
||||||
~WindowClassRegistrar() = default; |
HMODULE user32_module = LoadLibraryA("User32.dll"); |
||||||
|
if (!user32_module) { |
||||||
// Returns the singleton registar instance.
|
return; |
||||||
static WindowClassRegistrar* GetInstance() { |
} |
||||||
if (!instance_) { |
auto enable_non_client_dpi_scaling = |
||||||
instance_ = new WindowClassRegistrar(); |
reinterpret_cast<EnableNonClientDpiScaling*>( |
||||||
} |
GetProcAddress(user32_module, "EnableNonClientDpiScaling")); |
||||||
return instance_; |
if (enable_non_client_dpi_scaling != nullptr) { |
||||||
} |
enable_non_client_dpi_scaling(hwnd); |
||||||
|
} |
||||||
// Returns the name of the window class, registering the class if it hasn't
|
FreeLibrary(user32_module); |
||||||
// previously been registered.
|
} |
||||||
const wchar_t* GetWindowClass(); |
|
||||||
|
} // namespace
|
||||||
// Unregisters the window class. Should only be called if there are no
|
|
||||||
// instances of the window.
|
// Manages the Win32Window's window class registration.
|
||||||
void UnregisterWindowClass(); |
class WindowClassRegistrar { |
||||||
|
public: |
||||||
private: |
~WindowClassRegistrar() = default; |
||||||
WindowClassRegistrar() = default; |
|
||||||
|
// Returns the singleton registrar instance.
|
||||||
static WindowClassRegistrar* instance_; |
static WindowClassRegistrar* GetInstance() { |
||||||
|
if (!instance_) { |
||||||
bool class_registered_ = false; |
instance_ = new WindowClassRegistrar(); |
||||||
}; |
} |
||||||
|
return instance_; |
||||||
WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr; |
} |
||||||
|
|
||||||
const wchar_t* WindowClassRegistrar::GetWindowClass() { |
// Returns the name of the window class, registering the class if it hasn't
|
||||||
if (!class_registered_) { |
// previously been registered.
|
||||||
WNDCLASS window_class{}; |
const wchar_t* GetWindowClass(); |
||||||
window_class.hCursor = LoadCursor(nullptr, IDC_ARROW); |
|
||||||
window_class.lpszClassName = kWindowClassName; |
// Unregisters the window class. Should only be called if there are no
|
||||||
window_class.style = CS_HREDRAW | CS_VREDRAW; |
// instances of the window.
|
||||||
window_class.cbClsExtra = 0; |
void UnregisterWindowClass(); |
||||||
window_class.cbWndExtra = 0; |
|
||||||
window_class.hInstance = GetModuleHandle(nullptr); |
private: |
||||||
window_class.hIcon = |
WindowClassRegistrar() = default; |
||||||
LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON)); |
|
||||||
window_class.hbrBackground = 0; |
static WindowClassRegistrar* instance_; |
||||||
window_class.lpszMenuName = nullptr; |
|
||||||
window_class.lpfnWndProc = Win32Window::WndProc; |
bool class_registered_ = false; |
||||||
RegisterClass(&window_class); |
}; |
||||||
class_registered_ = true; |
|
||||||
} |
WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr; |
||||||
return kWindowClassName; |
|
||||||
} |
const wchar_t* WindowClassRegistrar::GetWindowClass() { |
||||||
|
if (!class_registered_) { |
||||||
void WindowClassRegistrar::UnregisterWindowClass() { |
WNDCLASS window_class{}; |
||||||
UnregisterClass(kWindowClassName, nullptr); |
window_class.hCursor = LoadCursor(nullptr, IDC_ARROW); |
||||||
class_registered_ = false; |
window_class.lpszClassName = kWindowClassName; |
||||||
} |
window_class.style = CS_HREDRAW | CS_VREDRAW; |
||||||
|
window_class.cbClsExtra = 0; |
||||||
Win32Window::Win32Window() { |
window_class.cbWndExtra = 0; |
||||||
++g_active_window_count; |
window_class.hInstance = GetModuleHandle(nullptr); |
||||||
} |
window_class.hIcon = |
||||||
|
LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON)); |
||||||
Win32Window::~Win32Window() { |
window_class.hbrBackground = 0; |
||||||
--g_active_window_count; |
window_class.lpszMenuName = nullptr; |
||||||
Destroy(); |
window_class.lpfnWndProc = Win32Window::WndProc; |
||||||
} |
RegisterClass(&window_class); |
||||||
|
class_registered_ = true; |
||||||
bool Win32Window::CreateAndShow(const std::wstring& title, |
} |
||||||
const Point& origin, |
return kWindowClassName; |
||||||
const Size& size) { |
} |
||||||
Destroy(); |
|
||||||
|
void WindowClassRegistrar::UnregisterWindowClass() { |
||||||
const wchar_t* window_class = |
UnregisterClass(kWindowClassName, nullptr); |
||||||
WindowClassRegistrar::GetInstance()->GetWindowClass(); |
class_registered_ = false; |
||||||
|
} |
||||||
const POINT target_point = {static_cast<LONG>(origin.x), |
|
||||||
static_cast<LONG>(origin.y)}; |
Win32Window::Win32Window() { |
||||||
HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST); |
++g_active_window_count; |
||||||
UINT dpi = FlutterDesktopGetDpiForMonitor(monitor); |
} |
||||||
double scale_factor = dpi / 96.0; |
|
||||||
|
Win32Window::~Win32Window() { |
||||||
HWND window = CreateWindow( |
--g_active_window_count; |
||||||
window_class, title.c_str(), WS_OVERLAPPEDWINDOW | WS_VISIBLE, |
Destroy(); |
||||||
Scale(origin.x, scale_factor), Scale(origin.y, scale_factor), |
} |
||||||
Scale(size.width, scale_factor), Scale(size.height, scale_factor), |
|
||||||
nullptr, nullptr, GetModuleHandle(nullptr), this); |
bool Win32Window::Create(const std::wstring& title, |
||||||
|
const Point& origin, |
||||||
if (!window) { |
const Size& size) { |
||||||
return false; |
Destroy(); |
||||||
} |
|
||||||
|
const wchar_t* window_class = |
||||||
return OnCreate(); |
WindowClassRegistrar::GetInstance()->GetWindowClass(); |
||||||
} |
|
||||||
|
const POINT target_point = {static_cast<LONG>(origin.x), |
||||||
// static
|
static_cast<LONG>(origin.y)}; |
||||||
LRESULT CALLBACK Win32Window::WndProc(HWND const window, |
HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST); |
||||||
UINT const message, |
UINT dpi = FlutterDesktopGetDpiForMonitor(monitor); |
||||||
WPARAM const wparam, |
double scale_factor = dpi / 96.0; |
||||||
LPARAM const lparam) noexcept { |
|
||||||
if (message == WM_NCCREATE) { |
HWND window = CreateWindow( |
||||||
auto window_struct = reinterpret_cast<CREATESTRUCT*>(lparam); |
window_class, title.c_str(), WS_OVERLAPPEDWINDOW, |
||||||
SetWindowLongPtr(window, GWLP_USERDATA, |
Scale(origin.x, scale_factor), Scale(origin.y, scale_factor), |
||||||
reinterpret_cast<LONG_PTR>(window_struct->lpCreateParams)); |
Scale(size.width, scale_factor), Scale(size.height, scale_factor), |
||||||
|
nullptr, nullptr, GetModuleHandle(nullptr), this); |
||||||
auto that = static_cast<Win32Window*>(window_struct->lpCreateParams); |
|
||||||
EnableFullDpiSupportIfAvailable(window); |
if (!window) { |
||||||
that->window_handle_ = window; |
return false; |
||||||
} else if (Win32Window* that = GetThisFromHandle(window)) { |
} |
||||||
return that->MessageHandler(window, message, wparam, lparam); |
|
||||||
} |
UpdateTheme(window); |
||||||
|
|
||||||
return DefWindowProc(window, message, wparam, lparam); |
return OnCreate(); |
||||||
} |
} |
||||||
|
|
||||||
LRESULT |
bool Win32Window::Show() { |
||||||
Win32Window::MessageHandler(HWND hwnd, |
return ShowWindow(window_handle_, SW_SHOWNORMAL); |
||||||
UINT const message, |
} |
||||||
WPARAM const wparam, |
|
||||||
LPARAM const lparam) noexcept { |
// static
|
||||||
switch (message) { |
LRESULT CALLBACK Win32Window::WndProc(HWND const window, |
||||||
case WM_DESTROY: |
UINT const message, |
||||||
window_handle_ = nullptr; |
WPARAM const wparam, |
||||||
Destroy(); |
LPARAM const lparam) noexcept { |
||||||
if (quit_on_close_) { |
if (message == WM_NCCREATE) { |
||||||
PostQuitMessage(0); |
auto window_struct = reinterpret_cast<CREATESTRUCT*>(lparam); |
||||||
} |
SetWindowLongPtr(window, GWLP_USERDATA, |
||||||
return 0; |
reinterpret_cast<LONG_PTR>(window_struct->lpCreateParams)); |
||||||
|
|
||||||
case WM_DPICHANGED: { |
auto that = static_cast<Win32Window*>(window_struct->lpCreateParams); |
||||||
auto newRectSize = reinterpret_cast<RECT*>(lparam); |
EnableFullDpiSupportIfAvailable(window); |
||||||
LONG newWidth = newRectSize->right - newRectSize->left; |
that->window_handle_ = window; |
||||||
LONG newHeight = newRectSize->bottom - newRectSize->top; |
} else if (Win32Window* that = GetThisFromHandle(window)) { |
||||||
|
return that->MessageHandler(window, message, wparam, lparam); |
||||||
SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth, |
} |
||||||
newHeight, SWP_NOZORDER | SWP_NOACTIVATE); |
|
||||||
|
return DefWindowProc(window, message, wparam, lparam); |
||||||
return 0; |
} |
||||||
} |
|
||||||
case WM_SIZE: { |
LRESULT |
||||||
RECT rect = GetClientArea(); |
Win32Window::MessageHandler(HWND hwnd, |
||||||
if (child_content_ != nullptr) { |
UINT const message, |
||||||
// Size and position the child window.
|
WPARAM const wparam, |
||||||
MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left, |
LPARAM const lparam) noexcept { |
||||||
rect.bottom - rect.top, TRUE); |
switch (message) { |
||||||
} |
case WM_DESTROY: |
||||||
return 0; |
window_handle_ = nullptr; |
||||||
} |
Destroy(); |
||||||
|
if (quit_on_close_) { |
||||||
case WM_ACTIVATE: |
PostQuitMessage(0); |
||||||
if (child_content_ != nullptr) { |
} |
||||||
SetFocus(child_content_); |
return 0; |
||||||
} |
|
||||||
return 0; |
case WM_DPICHANGED: { |
||||||
} |
auto newRectSize = reinterpret_cast<RECT*>(lparam); |
||||||
|
LONG newWidth = newRectSize->right - newRectSize->left; |
||||||
return DefWindowProc(window_handle_, message, wparam, lparam); |
LONG newHeight = newRectSize->bottom - newRectSize->top; |
||||||
} |
|
||||||
|
SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth, |
||||||
void Win32Window::Destroy() { |
newHeight, SWP_NOZORDER | SWP_NOACTIVATE); |
||||||
OnDestroy(); |
|
||||||
|
return 0; |
||||||
if (window_handle_) { |
} |
||||||
DestroyWindow(window_handle_); |
case WM_SIZE: { |
||||||
window_handle_ = nullptr; |
RECT rect = GetClientArea(); |
||||||
} |
if (child_content_ != nullptr) { |
||||||
if (g_active_window_count == 0) { |
// Size and position the child window.
|
||||||
WindowClassRegistrar::GetInstance()->UnregisterWindowClass(); |
MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left, |
||||||
} |
rect.bottom - rect.top, TRUE); |
||||||
} |
} |
||||||
|
return 0; |
||||||
Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept { |
} |
||||||
return reinterpret_cast<Win32Window*>( |
|
||||||
GetWindowLongPtr(window, GWLP_USERDATA)); |
case WM_ACTIVATE: |
||||||
} |
if (child_content_ != nullptr) { |
||||||
|
SetFocus(child_content_); |
||||||
void Win32Window::SetChildContent(HWND content) { |
} |
||||||
child_content_ = content; |
return 0; |
||||||
SetParent(content, window_handle_); |
|
||||||
RECT frame = GetClientArea(); |
case WM_DWMCOLORIZATIONCOLORCHANGED: |
||||||
|
UpdateTheme(hwnd); |
||||||
MoveWindow(content, frame.left, frame.top, frame.right - frame.left, |
return 0; |
||||||
frame.bottom - frame.top, true); |
} |
||||||
|
|
||||||
SetFocus(child_content_); |
return DefWindowProc(window_handle_, message, wparam, lparam); |
||||||
} |
} |
||||||
|
|
||||||
RECT Win32Window::GetClientArea() { |
void Win32Window::Destroy() { |
||||||
RECT frame; |
OnDestroy(); |
||||||
GetClientRect(window_handle_, &frame); |
|
||||||
return frame; |
if (window_handle_) { |
||||||
} |
DestroyWindow(window_handle_); |
||||||
|
window_handle_ = nullptr; |
||||||
HWND Win32Window::GetHandle() { |
} |
||||||
return window_handle_; |
if (g_active_window_count == 0) { |
||||||
} |
WindowClassRegistrar::GetInstance()->UnregisterWindowClass(); |
||||||
|
} |
||||||
void Win32Window::SetQuitOnClose(bool quit_on_close) { |
} |
||||||
quit_on_close_ = quit_on_close; |
|
||||||
} |
Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept { |
||||||
|
return reinterpret_cast<Win32Window*>( |
||||||
bool Win32Window::OnCreate() { |
GetWindowLongPtr(window, GWLP_USERDATA)); |
||||||
// No-op; provided for subclasses.
|
} |
||||||
return true; |
|
||||||
} |
void Win32Window::SetChildContent(HWND content) { |
||||||
|
child_content_ = content; |
||||||
void Win32Window::OnDestroy() { |
SetParent(content, window_handle_); |
||||||
// No-op; provided for subclasses.
|
RECT frame = GetClientArea(); |
||||||
} |
|
||||||
|
MoveWindow(content, frame.left, frame.top, frame.right - frame.left, |
||||||
|
frame.bottom - frame.top, true); |
||||||
|
|
||||||
|
SetFocus(child_content_); |
||||||
|
} |
||||||
|
|
||||||
|
RECT Win32Window::GetClientArea() { |
||||||
|
RECT frame; |
||||||
|
GetClientRect(window_handle_, &frame); |
||||||
|
return frame; |
||||||
|
} |
||||||
|
|
||||||
|
HWND Win32Window::GetHandle() { |
||||||
|
return window_handle_; |
||||||
|
} |
||||||
|
|
||||||
|
void Win32Window::SetQuitOnClose(bool quit_on_close) { |
||||||
|
quit_on_close_ = quit_on_close; |
||||||
|
} |
||||||
|
|
||||||
|
bool Win32Window::OnCreate() { |
||||||
|
// No-op; provided for subclasses.
|
||||||
|
return true; |
||||||
|
} |
||||||
|
|
||||||
|
void Win32Window::OnDestroy() { |
||||||
|
// No-op; provided for subclasses.
|
||||||
|
} |
||||||
|
|
||||||
|
void Win32Window::UpdateTheme(HWND const window) { |
||||||
|
DWORD light_mode; |
||||||
|
DWORD light_mode_size = sizeof(light_mode); |
||||||
|
LSTATUS result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey, |
||||||
|
kGetPreferredBrightnessRegValue, |
||||||
|
RRF_RT_REG_DWORD, nullptr, &light_mode, |
||||||
|
&light_mode_size); |
||||||
|
|
||||||
|
if (result == ERROR_SUCCESS) { |
||||||
|
BOOL enable_dark_mode = light_mode == 0; |
||||||
|
DwmSetWindowAttribute(window, DWMWA_USE_IMMERSIVE_DARK_MODE, |
||||||
|
&enable_dark_mode, sizeof(enable_dark_mode)); |
||||||
|
} |
||||||
|
} |
||||||
|
|||||||
@ -1,98 +1,102 @@ |
|||||||
#ifndef RUNNER_WIN32_WINDOW_H_ |
#ifndef RUNNER_WIN32_WINDOW_H_ |
||||||
#define RUNNER_WIN32_WINDOW_H_ |
#define RUNNER_WIN32_WINDOW_H_ |
||||||
|
|
||||||
#include <windows.h> |
#include <windows.h> |
||||||
|
|
||||||
#include <functional> |
#include <functional> |
||||||
#include <memory> |
#include <memory> |
||||||
#include <string> |
#include <string> |
||||||
|
|
||||||
// A class abstraction for a high DPI-aware Win32 Window. Intended to be
|
// A class abstraction for a high DPI-aware Win32 Window. Intended to be
|
||||||
// inherited from by classes that wish to specialize with custom
|
// inherited from by classes that wish to specialize with custom
|
||||||
// rendering and input handling
|
// rendering and input handling
|
||||||
class Win32Window { |
class Win32Window { |
||||||
public: |
public: |
||||||
struct Point { |
struct Point { |
||||||
unsigned int x; |
unsigned int x; |
||||||
unsigned int y; |
unsigned int y; |
||||||
Point(unsigned int x, unsigned int y) : x(x), y(y) {} |
Point(unsigned int x, unsigned int y) : x(x), y(y) {} |
||||||
}; |
}; |
||||||
|
|
||||||
struct Size { |
struct Size { |
||||||
unsigned int width; |
unsigned int width; |
||||||
unsigned int height; |
unsigned int height; |
||||||
Size(unsigned int width, unsigned int height) |
Size(unsigned int width, unsigned int height) |
||||||
: width(width), height(height) {} |
: width(width), height(height) {} |
||||||
}; |
}; |
||||||
|
|
||||||
Win32Window(); |
Win32Window(); |
||||||
virtual ~Win32Window(); |
virtual ~Win32Window(); |
||||||
|
|
||||||
// Creates and shows a win32 window with |title| and position and size using
|
// Creates a win32 window with |title| that is positioned and sized using
|
||||||
// |origin| and |size|. New windows are created on the default monitor. Window
|
// |origin| and |size|. New windows are created on the default monitor. Window
|
||||||
// sizes are specified to the OS in physical pixels, hence to ensure a
|
// sizes are specified to the OS in physical pixels, hence to ensure a
|
||||||
// consistent size to will treat the width height passed in to this function
|
// consistent size this function will scale the inputted width and height as
|
||||||
// as logical pixels and scale to appropriate for the default monitor. Returns
|
// as appropriate for the default monitor. The window is invisible until
|
||||||
// true if the window was created successfully.
|
// |Show| is called. Returns true if the window was created successfully.
|
||||||
bool CreateAndShow(const std::wstring& title, |
bool Create(const std::wstring& title, const Point& origin, const Size& size); |
||||||
const Point& origin, |
|
||||||
const Size& size); |
// Show the current window. Returns true if the window was successfully shown.
|
||||||
|
bool Show(); |
||||||
// Release OS resources associated with window.
|
|
||||||
void Destroy(); |
// Release OS resources associated with window.
|
||||||
|
void Destroy(); |
||||||
// Inserts |content| into the window tree.
|
|
||||||
void SetChildContent(HWND content); |
// Inserts |content| into the window tree.
|
||||||
|
void SetChildContent(HWND content); |
||||||
// Returns the backing Window handle to enable clients to set icon and other
|
|
||||||
// window properties. Returns nullptr if the window has been destroyed.
|
// Returns the backing Window handle to enable clients to set icon and other
|
||||||
HWND GetHandle(); |
// window properties. Returns nullptr if the window has been destroyed.
|
||||||
|
HWND GetHandle(); |
||||||
// If true, closing this window will quit the application.
|
|
||||||
void SetQuitOnClose(bool quit_on_close); |
// If true, closing this window will quit the application.
|
||||||
|
void SetQuitOnClose(bool quit_on_close); |
||||||
// Return a RECT representing the bounds of the current client area.
|
|
||||||
RECT GetClientArea(); |
// Return a RECT representing the bounds of the current client area.
|
||||||
|
RECT GetClientArea(); |
||||||
protected: |
|
||||||
// Processes and route salient window messages for mouse handling,
|
protected: |
||||||
// size change and DPI. Delegates handling of these to member overloads that
|
// Processes and route salient window messages for mouse handling,
|
||||||
// inheriting classes can handle.
|
// size change and DPI. Delegates handling of these to member overloads that
|
||||||
virtual LRESULT MessageHandler(HWND window, |
// inheriting classes can handle.
|
||||||
UINT const message, |
virtual LRESULT MessageHandler(HWND window, |
||||||
WPARAM const wparam, |
UINT const message, |
||||||
LPARAM const lparam) noexcept; |
WPARAM const wparam, |
||||||
|
LPARAM const lparam) noexcept; |
||||||
// Called when CreateAndShow is called, allowing subclass window-related
|
|
||||||
// setup. Subclasses should return false if setup fails.
|
// Called when CreateAndShow is called, allowing subclass window-related
|
||||||
virtual bool OnCreate(); |
// setup. Subclasses should return false if setup fails.
|
||||||
|
virtual bool OnCreate(); |
||||||
// Called when Destroy is called.
|
|
||||||
virtual void OnDestroy(); |
// Called when Destroy is called.
|
||||||
|
virtual void OnDestroy(); |
||||||
private: |
|
||||||
friend class WindowClassRegistrar; |
private: |
||||||
|
friend class WindowClassRegistrar; |
||||||
// OS callback called by message pump. Handles the WM_NCCREATE message which
|
|
||||||
// is passed when the non-client area is being created and enables automatic
|
// OS callback called by message pump. Handles the WM_NCCREATE message which
|
||||||
// non-client DPI scaling so that the non-client area automatically
|
// is passed when the non-client area is being created and enables automatic
|
||||||
// responsponds to changes in DPI. All other messages are handled by
|
// non-client DPI scaling so that the non-client area automatically
|
||||||
// MessageHandler.
|
// responds to changes in DPI. All other messages are handled by
|
||||||
static LRESULT CALLBACK WndProc(HWND const window, |
// MessageHandler.
|
||||||
UINT const message, |
static LRESULT CALLBACK WndProc(HWND const window, |
||||||
WPARAM const wparam, |
UINT const message, |
||||||
LPARAM const lparam) noexcept; |
WPARAM const wparam, |
||||||
|
LPARAM const lparam) noexcept; |
||||||
// Retrieves a class instance pointer for |window|
|
|
||||||
static Win32Window* GetThisFromHandle(HWND const window) noexcept; |
// Retrieves a class instance pointer for |window|
|
||||||
|
static Win32Window* GetThisFromHandle(HWND const window) noexcept; |
||||||
bool quit_on_close_ = false; |
|
||||||
|
// Update the window frame's theme to match the system theme.
|
||||||
// window handle for top level window.
|
static void UpdateTheme(HWND const window); |
||||||
HWND window_handle_ = nullptr; |
|
||||||
|
bool quit_on_close_ = false; |
||||||
// window handle for hosted content.
|
|
||||||
HWND child_content_ = nullptr; |
// window handle for top level window.
|
||||||
}; |
HWND window_handle_ = nullptr; |
||||||
|
|
||||||
#endif // RUNNER_WIN32_WINDOW_H_
|
// window handle for hosted content.
|
||||||
|
HWND child_content_ = nullptr; |
||||||
|
}; |
||||||
|
|
||||||
|
#endif // RUNNER_WIN32_WINDOW_H_
|
||||||
|
|||||||
Loading…
Reference in new issue