From 516cec55658df7eacaa27735d4fdf134b800bc53 Mon Sep 17 00:00:00 2001 From: Junyuan Feng Date: Sun, 9 Jan 2022 23:11:51 +0800 Subject: [PATCH] change default macos window size --- ios/Runner.xcodeproj/project.pbxproj | 12 ++++++------ lib/app.dart | 1 - lib/data/res/build_data.dart | 4 ++-- lib/view/page/server/tab.dart | 8 +++----- macos/Runner/MainFlutterWindow.swift | 2 +- 5 files changed, 12 insertions(+), 15 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index cb7f3ff3..08f4e706 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -354,7 +354,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 75; + CURRENT_PROJECT_VERSION = 76; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -362,7 +362,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.75; + MARKETING_VERSION = 1.0.76; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -484,7 +484,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 75; + CURRENT_PROJECT_VERSION = 76; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -492,7 +492,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.75; + MARKETING_VERSION = 1.0.76; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -508,7 +508,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 75; + CURRENT_PROJECT_VERSION = 76; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -516,7 +516,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.75; + MARKETING_VERSION = 1.0.76; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; diff --git a/lib/app.dart b/lib/app.dart index 14c09219..f4b733a9 100644 --- a/lib/app.dart +++ b/lib/app.dart @@ -21,7 +21,6 @@ class MyApp extends StatelessWidget { }); } - // This widget is the root of your application. @override Widget build(BuildContext context) { return ValueListenableBuilder( diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index eca0dcd7..7301c779 100644 --- a/lib/data/res/build_data.dart +++ b/lib/data/res/build_data.dart @@ -2,8 +2,8 @@ class BuildData { static const String name = "ToolBox"; - static const int build = 75; + static const int build = 79; static const String engine = "Flutter 2.8.1 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision 77d935af4d (3 weeks ago) • 2021-12-16 08:37:33 -0800\nEngine • revision 890a5fca2e\nTools • Dart 2.15.1\n"; - static const String buildAt = "2022-01-09 21:15:10.423669"; + static const String buildAt = "2022-01-09 23:06:53.086748"; static const int modifications = 0; } diff --git a/lib/view/page/server/tab.dart b/lib/view/page/server/tab.dart index 480c77d8..5100bed0 100644 --- a/lib/view/page/server/tab.dart +++ b/lib/view/page/server/tab.dart @@ -239,9 +239,7 @@ class _ServerPageState extends State Widget _buildPercentCircle(double percent, String title) { if (percent <= 0) percent = 0.01; if (percent >= 100) percent = 99.9; - final height = _media.size.width / _media.size.height >= 9 / 16 - ? _media.size.height * 0.051 - : _media.size.height * 0.088; + var size = _media.size.height * 0.147; return SizedBox( width: _media.size.width * 0.2, height: _media.size.height * 0.1, @@ -254,8 +252,8 @@ class _ServerPageState extends State progressColor: _primaryColor, progressNumber: percent, maxNumber: 100, - width: _media.size.width * 0.37, - height: height, + width: size, + height: size / 1.5, ), Positioned.fill( child: Center( diff --git a/macos/Runner/MainFlutterWindow.swift b/macos/Runner/MainFlutterWindow.swift index 2650ff59..ad4a28d5 100644 --- a/macos/Runner/MainFlutterWindow.swift +++ b/macos/Runner/MainFlutterWindow.swift @@ -5,7 +5,7 @@ class MainFlutterWindow: NSWindow { override func awakeFromNib() { let flutterViewController = FlutterViewController.init() var windowFrame = self.frame - windowFrame.size = CGSize(width: 1080, height: 1920) + windowFrame.size = CGSize(width: 450, height: 800) self.contentViewController = flutterViewController self.setFrame(windowFrame, display: true)