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

Merge pull request #6061 from dignow/fix/remove_warns_misspelling

Browse Source 
fix, remove warns, misspellings
This commit is contained in:
RustDesk 2023-10-17 11:06:01 +08:00 committed by GitHub
commit 975037c5a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
flutter/lib/models/chat_model.dart
View File

@ -103,7 +103,7 @@ class ChatModel with ChangeNotifier {
void setOverlayState(BlockableOverlayState blockableOverlayState) { void setOverlayState(BlockableOverlayState blockableOverlayState) {
_blockableOverlayState = blockableOverlayState; _blockableOverlayState = blockableOverlayState;
_blockableOverlayState!.addMiddleBlockedListener((v) { _blockableOverlayState.addMiddleBlockedListener((v) {
if (!v) { if (!v) {
isWindowFocus.value = false; isWindowFocus.value = false;
if (isWindowFocus.value) { if (isWindowFocus.value) {
@ -197,9 +197,9 @@ class ChatModel with ChangeNotifier {
showChatWindowOverlay({Offset? chatInitPos}) { showChatWindowOverlay({Offset? chatInitPos}) {
if (chatWindowOverlayEntry != null) return; if (chatWindowOverlayEntry != null) return;
isWindowFocus.value = true; isWindowFocus.value = true;
_blockableOverlayState?.setMiddleBlocked(true); _blockableOverlayState.setMiddleBlocked(true);
final overlayState = _blockableOverlayState?.state; final overlayState = _blockableOverlayState.state;
if (overlayState == null) return; if (overlayState == null) return;
if (isMobile && if (isMobile &&
!gFFI.chatModel.currentKey.isOut && // not in remote page !gFFI.chatModel.currentKey.isOut && // not in remote page
@ -212,7 +212,7 @@ class ChatModel with ChangeNotifier {
onPointerDown: (_) { onPointerDown: (_) {
if (!isWindowFocus.value) { if (!isWindowFocus.value) {
isWindowFocus.value = true; isWindowFocus.value = true;
_blockableOverlayState?.setMiddleBlocked(true); _blockableOverlayState.setMiddleBlocked(true);
} }
}, },
child: DraggableChatWindow( child: DraggableChatWindow(
@ -228,7 +228,7 @@ class ChatModel with ChangeNotifier {
hideChatWindowOverlay() { hideChatWindowOverlay() {
if (chatWindowOverlayEntry != null) { if (chatWindowOverlayEntry != null) {
_blockableOverlayState?.setMiddleBlocked(false); _blockableOverlayState.setMiddleBlocked(false);
chatWindowOverlayEntry!.remove(); chatWindowOverlayEntry!.remove();
chatWindowOverlayEntry = null; chatWindowOverlayEntry = null;
return; return;

14
flutter/lib/models/model.dart
View File

@ -689,12 +689,12 @@ class FfiModel with ChangeNotifier {
sessionId: sessionId, arg: 'view-only')); sessionId: sessionId, arg: 'view-only'));
} }
if (connType == ConnType.defaultConn) { if (connType == ConnType.defaultConn) {
final platformDdditions = evt['platform_additions']; final platformAdditions = evt['platform_additions'];
if (platformDdditions != null && platformDdditions != '') { if (platformAdditions != null && platformAdditions != '') {
try { try {
_pi.platformDdditions = json.decode(platformDdditions); _pi.platformAdditions = json.decode(platformAdditions);
} catch (e) { } catch (e) {
debugPrint('Failed to decode platformDdditions $e'); debugPrint('Failed to decode platformAdditions $e');
} }
} }
} }
@ -2203,13 +2203,13 @@ class PeerInfo with ChangeNotifier {
List<Display> displays = []; List<Display> displays = [];
Features features = Features(); Features features = Features();
List<Resolution> resolutions = []; List<Resolution> resolutions = [];
Map<String, dynamic> platformDdditions = {}; Map<String, dynamic> platformAdditions = {};
RxInt displaysCount = 0.obs; RxInt displaysCount = 0.obs;
RxBool isSet = false.obs; RxBool isSet = false.obs;
bool get isWayland => platformDdditions['is_wayland'] == true; bool get isWayland => platformAdditions['is_wayland'] == true;
bool get isHeadless => platformDdditions['headless'] == true; bool get isHeadless => platformAdditions['headless'] == true;
bool get isSupportMultiDisplay => isDesktop && isSupportMultiUiSession; bool get isSupportMultiDisplay => isDesktop && isSupportMultiUiSession;