talksik/flutter-elinux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update for flutter 3.7.0 (#158)

Browse Source 
Signed-off-by: Hidenori Matsubayashi <[email protected]>
This commit is contained in:
Hidenori Matsubayashi
2023-01-25 23:39:11 +09:00
committed by GitHub
parent 19a1b05ea2
commit 51a1d68590
14 changed files with 85 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/app/runner/flutter_embedder_options.h
+14 -3
View File
@@ -1,4 +1,4 @@
// Copyright 2022 Sony Corporation. All rights reserved.
// Copyright 2023 Sony Corporation. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -22,17 +22,21 @@ class FlutterEmbedderOptions {
"Window rotation(degree) [0(default)|90|180|270]", 0,
false);
options_.AddDouble("force-scale-factor", "s",
"Force a scale factor instead using default value", 1.0,
false);
"Force a scale factor instead using default value", 1.0,
false);
#if defined(FLUTTER_TARGET_BACKEND_GBM) || \
defined(FLUTTER_TARGET_BACKEND_EGLSTREAM)
// no more options.
#elif defined(FLUTTER_TARGET_BACKEND_X11)
options_.AddString("title", "t", "Window title", "Flutter", false);
options_.AddWithoutValue("fullscreen", "f", "Always full-screen display",
false);
options_.AddInt("width", "w", "Window width", 1280, false);
options_.AddInt("height", "h", "Window height", 720, false);
#else // FLUTTER_TARGET_BACKEND_WAYLAND
options_.AddString("title", "t", "Window title", "Flutter", false);
options_.AddString("app-id", "a", "XDG App ID", "dev.flutter.elinux",
false);
options_.AddWithoutValue("onscreen-keyboard", "k",
"Enable on-screen keyboard", false);
options_.AddWithoutValue("window-decoration", "d",
@@ -91,6 +95,7 @@ class FlutterEmbedderOptions {
#elif defined(FLUTTER_TARGET_BACKEND_X11)
use_onscreen_keyboard_ = false;
use_window_decoration_ = false;
window_title_ = options_.GetValue<std::string>("title");
window_view_mode_ =
options_.Exist("fullscreen")
? flutter::FlutterViewController::ViewMode::kFullscreen
@@ -98,6 +103,8 @@ class FlutterEmbedderOptions {
window_width_ = options_.GetValue<int>("width");
window_height_ = options_.GetValue<int>("height");
#else // FLUTTER_TARGET_BACKEND_WAYLAND
window_title_ = options_.GetValue<std::string>("title");
window_app_id_ = options_.GetValue<std::string>("app-id");
use_onscreen_keyboard_ = options_.Exist("onscreen-keyboard");
use_window_decoration_ = options_.Exist("window-decoration");
window_view_mode_ =
@@ -112,6 +119,8 @@ class FlutterEmbedderOptions {
}
std::string BundlePath() const { return bundle_path_; }
std::string WindowTitle() const { return window_title_; }
std::string WindowAppID() const { return window_app_id_; }
bool IsUseMouseCursor() const { return use_mouse_cursor_; }
bool IsUseOnscreenKeyboard() const { return use_onscreen_keyboard_; }
bool IsUseWindowDecoraation() const { return use_window_decoration_; }
@@ -130,6 +139,8 @@ class FlutterEmbedderOptions {
commandline::CommandOptions options_;
std::string bundle_path_;
std::string window_title_;
std::string window_app_id_;
bool use_mouse_cursor_ = true;
bool use_onscreen_keyboard_ = false;
bool use_window_decoration_ = false;
templates/app/runner/main.cc
+3 -1
View File
@@ -1,4 +1,4 @@
// Copyright 2022 Sony Corporation. All rights reserved.
// Copyright 2023 Sony Corporation. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -30,6 +30,8 @@ int main(int argc, char** argv) {
view_properties.height = options.WindowHeight();
view_properties.view_mode = options.WindowViewMode();
view_properties.view_rotation = options.WindowRotation();
view_properties.title = options.WindowTitle();
view_properties.app_id = options.WindowAppID();
view_properties.use_mouse_cursor = options.IsUseMouseCursor();
view_properties.use_onscreen_keyboard = options.IsUseOnscreenKeyboard();
view_properties.use_window_decoration = options.IsUseWindowDecoraation();