Support better window position memory

Add windows arm64 and linux arm64 build script

Optimize some details
This commit is contained in:
chen08209
2024-12-06 22:35:28 +08:00
parent ece8a48181
commit 375c4e0884
26 changed files with 353 additions and 157 deletions

View File

@@ -116,13 +116,11 @@ class Other {
return "assets/images/icon_white.png";
}
final suffix = Platform.isWindows ? "ico" : "png";
if (Platform.isWindows) {
return "assets/images/icon.$suffix";
}
return switch (brightness) {
Brightness.dark => "assets/images/icon_white.$suffix",
Brightness.light => "assets/images/icon_black.$suffix",
};
return "assets/images/icon.$suffix";
// return switch (brightness) {
// Brightness.dark => "assets/images/icon_white.$suffix",
// Brightness.light => "assets/images/icon_black.$suffix",
// };
}
int compareVersions(String version1, String version2) {

View File

@@ -78,7 +78,7 @@ class Tray {
MenuItem.checkbox(
label: Intl.message(mode.name),
onClick: (_) {
globalState.appController.clashConfig.mode = mode;
globalState.appController.changeMode(mode);
},
checked: mode == clashConfig.mode,
),

View File

@@ -3,6 +3,7 @@ import 'dart:io';
import 'package:fl_clash/common/common.dart';
import 'package:fl_clash/models/config.dart';
import 'package:flutter/material.dart';
import 'package:screen_retriever/screen_retriever.dart';
import 'package:window_manager/window_manager.dart';
class Window {
@@ -23,6 +24,35 @@ class Window {
);
if (!Platform.isMacOS || version > 10) {
await windowManager.setTitleBarStyle(TitleBarStyle.hidden);
final left = props.left ?? 0;
final top = props.top ?? 0;
final right = left + props.width;
final bottom = top + props.height;
if (left == 0 && top == 0) {
await windowManager.setAlignment(Alignment.center);
} else {
final displays = await screenRetriever.getAllDisplays();
final isPositionValid = displays.any(
(display) {
final displayBounds = Rect.fromLTWH(
display.visiblePosition!.dx,
display.visiblePosition!.dy,
display.size.width,
display.size.height,
);
return displayBounds.contains(Offset(left, top)) ||
displayBounds.contains(Offset(right, bottom));
},
);
if (isPositionValid) {
await windowManager.setPosition(
Offset(
left,
top,
),
);
}
}
}
await windowManager.waitUntilReadyToShow(windowOptions, () async {
await windowManager.setPreventClose(true);

View File

@@ -582,6 +582,14 @@ class AppController {
updateStatus(!appFlowingState.isStart);
}
changeMode(Mode mode) {
clashConfig.mode = mode;
if (mode == Mode.global) {
config.updateCurrentGroupName(GroupName.GLOBAL.name);
}
addCheckIpNumDebounce();
}
updateAutoLaunch() {
config.appSetting = config.appSetting.copyWith(
autoLaunch: !config.appSetting.autoLaunch,

View File

@@ -38,6 +38,9 @@ class _ConnectionsFragmentState extends State<ConnectionsFragment> {
timer = Timer.periodic(
const Duration(seconds: 1),
(timer) async {
if (!context.mounted) {
return;
}
connectionsNotifier.value = connectionsNotifier.value.copyWith(
connections: await clashCore.getConnections(),
);

View File

@@ -10,14 +10,6 @@ import 'package:provider/provider.dart';
class OutboundMode extends StatelessWidget {
const OutboundMode({super.key});
_changeMode(BuildContext context, Mode? value) async {
final appController = globalState.appController;
final clashConfig = appController.clashConfig;
if (value == null || clashConfig.mode == value) return;
clashConfig.mode = value;
appController.addCheckIpNumDebounce();
}
@override
Widget build(BuildContext context) {
return Selector<ClashConfig, Mode>(
@@ -50,7 +42,10 @@ class OutboundMode extends StatelessWidget {
value: item,
groupValue: mode,
onChanged: (value) async {
_changeMode(context, value);
if (value == null) {
return;
}
globalState.appController.changeMode(value);
},
),
title: Text(

View File

@@ -299,7 +299,7 @@ class _ProxiesListFragmentState extends State<ProxiesListFragment> {
headerState.currentIndex > state.groupNames.length - 1
? 0
: headerState.currentIndex;
if (index < 0) {
if (index < 0 || state.groupNames.isEmpty) {
return Container();
}
return Stack(

View File

@@ -117,9 +117,11 @@ class ProxiesTabFragmentState extends State<ProxiesTabFragment>
}
final currentGroup = currentGroups[index ?? _tabController!.index];
currentProxies = currentGroup.all;
appController.config.updateCurrentGroupName(
currentGroup.name,
);
WidgetsBinding.instance.addPostFrameCallback((_) {
appController.config.updateCurrentGroupName(
currentGroup.name,
);
});
}
_destroyTabController() {
@@ -129,6 +131,10 @@ class ProxiesTabFragmentState extends State<ProxiesTabFragment>
}
_updateTabController(int length, int index) {
if (length == 0) {
_destroyTabController();
return;
}
final realIndex = index == -1 ? 0 : index;
_tabController ??= TabController(
length: length,
@@ -162,6 +168,9 @@ class ProxiesTabFragmentState extends State<ProxiesTabFragment>
(item) => item == state.currentGroupName,
);
_updateTabController(state.groupNames.length, index);
if (state.groupNames.isEmpty) {
return Container();
}
final GroupNameKeyMap keyMap = {};
final children = state.groupNames.map((groupName) {
keyMap[groupName] = GlobalObjectKey(groupName);
@@ -281,12 +290,15 @@ class ProxyGroupViewState extends State<ProxyGroupView> {
if (_controller.position.maxScrollExtent == 0) {
return;
}
final sortedProxies = globalState.appController.getSortProxies(
currentProxies,
);
_controller.animateTo(
min(
16 +
getScrollToSelectedOffset(
groupName: groupName,
proxies: currentProxies,
proxies: sortedProxies,
),
_controller.position.maxScrollExtent,
),

View File

@@ -67,6 +67,12 @@ class _WindowContainerState extends State<WindowManager>
@override
Future<void> onWindowMoved() async {
super.onWindowMoved();
final offset = await windowManager.getPosition();
final config = globalState.appController.config;
config.windowProps = config.windowProps.copyWith(
top: offset.dy,
left: offset.dx,
);
}
@override

View File

@@ -212,9 +212,7 @@ class AppState with ChangeNotifier {
case Mode.direct:
return [];
case Mode.global:
return groups
.where((element) => element.name == GroupName.GLOBAL.name)
.toList();
return groups.toList();
case Mode.rule:
return groups
.where((item) => item.hidden == false)