Skip to content

Commit

Permalink
chore: Update project files after Flutter upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
donnywellson committed Oct 13, 2024
1 parent 251bb24 commit 349070a
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 20 deletions.
26 changes: 7 additions & 19 deletions .metadata
Original file line number Diff line number Diff line change
@@ -1,35 +1,23 @@
# This file tracks properties of this Flutter project.
# Used by Flutter tool to assess capabilities and perform upgrades etc.
#
# This file should be version controlled.
# This file should be version controlled and should not be manually edited.

version:
revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
channel: main
revision: "05ef4d31315f538bf0a60600e0e6efaf89acc6c2"
channel: "main"

project_type: app

# Tracks metadata for the flutter migrate command
migration:
platforms:
- platform: root
create_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
base_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
create_revision: 05ef4d31315f538bf0a60600e0e6efaf89acc6c2
base_revision: 05ef4d31315f538bf0a60600e0e6efaf89acc6c2
- platform: android
create_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
base_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
- platform: ios
create_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
base_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
- platform: linux
create_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
base_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
- platform: macos
create_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
base_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
- platform: windows
create_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
base_revision: c9dd4584702dc5ab67a6dc9c6ebaa33739bac811
create_revision: 05ef4d31315f538bf0a60600e0e6efaf89acc6c2
base_revision: 05ef4d31315f538bf0a60600e0e6efaf89acc6c2

# User provided section

Expand Down
7 changes: 6 additions & 1 deletion windows/flutter/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ include(${EPHEMERAL_DIR}/generated_config.cmake)
# https://github.com/flutter/flutter/issues/57146.
set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper")

# Set fallback configurations for older versions of the flutter tool.
if (NOT DEFINED FLUTTER_TARGET_PLATFORM)
set(FLUTTER_TARGET_PLATFORM "windows-x64")
endif()

# === Flutter Library ===
set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll")

Expand Down Expand Up @@ -92,7 +97,7 @@ add_custom_command(
COMMAND ${CMAKE_COMMAND} -E env
${FLUTTER_TOOL_ENVIRONMENT}
"${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat"
windows-x64 $<CONFIG>
${FLUTTER_TARGET_PLATFORM} $<CONFIG>
VERBATIM
)
add_custom_target(flutter_assemble DEPENDS
Expand Down
5 changes: 5 additions & 0 deletions windows/runner/flutter_window.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ bool FlutterWindow::OnCreate() {
this->Show();
});

// Flutter can complete the first frame before the "show window" callback is
// registered. The following call ensures a frame is pending to ensure the
// window is shown. It is a no-op if the first frame hasn't completed yet.
flutter_controller_->ForceRedraw();

return true;
}

Expand Down

0 comments on commit 349070a

Please sign in to comment.