hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

keep text scale factor (except android)

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages 2022-08-23 19:47:56 +08:00
parent 06064ee9f5
commit 5497a59823
1 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
flutter/lib/main.dart
View File

@ -112,12 +112,14 @@ void runRemoteScreen(Map<String, dynamic> argument) async {
navigatorObservers: [ navigatorObservers: [
// FirebaseAnalyticsObserver(analytics: analytics), // FirebaseAnalyticsObserver(analytics: analytics),
], ],
builder: _keepScaleBuilder(),
)); ));
} }
void runFileTransferScreen(Map<String, dynamic> argument) async { void runFileTransferScreen(Map<String, dynamic> argument) async {
await initEnv(kAppTypeDesktopFileTransfer); await initEnv(kAppTypeDesktopFileTransfer);
runApp(GetMaterialApp( runApp(
GetMaterialApp(
navigatorKey: globalKey, navigatorKey: globalKey,
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
title: 'RustDesk - File Transfer', title: 'RustDesk - File Transfer',
@ -125,7 +127,10 @@ void runFileTransferScreen(Map<String, dynamic> argument) async {
home: DesktopFileTransferScreen(params: argument), home: DesktopFileTransferScreen(params: argument),
navigatorObservers: [ navigatorObservers: [
// FirebaseAnalyticsObserver(analytics: analytics), // FirebaseAnalyticsObserver(analytics: analytics),
])); ],
builder: _keepScaleBuilder(),
),
);
} }
void runConnectionManagerScreen() async { void runConnectionManagerScreen() async {
@ -142,7 +147,8 @@ void runConnectionManagerScreen() async {
runApp(GetMaterialApp( runApp(GetMaterialApp(
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
theme: getCurrentTheme(), theme: getCurrentTheme(),
home: DesktopServerPage())); home: DesktopServerPage(),
builder: _keepScaleBuilder()));
} }
WindowOptions getHiddenTitleBarWindowOptions(Size size) { WindowOptions getHiddenTitleBarWindowOptions(Size size) {
@ -171,23 +177,35 @@ class App extends StatelessWidget {
ChangeNotifierProvider.value(value: gFFI.userModel), ChangeNotifierProvider.value(value: gFFI.userModel),
], ],
child: GetMaterialApp( child: GetMaterialApp(
navigatorKey: globalKey, navigatorKey: globalKey,
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
title: 'RustDesk', title: 'RustDesk',
theme: getCurrentTheme(), theme: getCurrentTheme(),
home: isDesktop home: isDesktop
? DesktopTabPage() ? DesktopTabPage()
: !isAndroid : !isAndroid
? WebHomePage() ? WebHomePage()
: HomePage(), : HomePage(),
navigatorObservers: [ navigatorObservers: [
// FirebaseAnalyticsObserver(analytics: analytics), // FirebaseAnalyticsObserver(analytics: analytics),
], ],
builder: isAndroid builder: isAndroid
? (_, child) => AccessibilityListener( ? (_, child) => AccessibilityListener(
child: child, child: child,
) )
: null), : _keepScaleBuilder(),
),
); );
} }
} }
_keepScaleBuilder() {
return (BuildContext context, Widget? child) {
return MediaQuery(
data: MediaQuery.of(context).copyWith(
textScaleFactor: 1.0,
),
child: child ?? Container(),
);
};
}