From 9a7a6004070587178bb8e268268f08917c14588a Mon Sep 17 00:00:00 2001 From: dignow Date: Wed, 9 Aug 2023 12:46:12 +0800 Subject: [PATCH] remove global render texture instance Signed-off-by: dignow --- flutter/lib/desktop/pages/remote_page.dart | 6 +----- flutter/lib/desktop/widgets/tabbar_widget.dart | 2 -- flutter/lib/models/desktop_render_texture.dart | 5 ----- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/flutter/lib/desktop/pages/remote_page.dart b/flutter/lib/desktop/pages/remote_page.dart index b39b1a927..28212e4ca 100644 --- a/flutter/lib/desktop/pages/remote_page.dart +++ b/flutter/lib/desktop/pages/remote_page.dart @@ -116,11 +116,7 @@ class _RemotePageState extends State Wakelock.enable(); } // Register texture. - if (mainGetLocalBoolOptionSync(kOptionOpenNewConnInTabs)) { - _renderTexture = RenderTexture(); - } else { - _renderTexture = renderTexture; - } + _renderTexture = RenderTexture(); _renderTexture.create(sessionId); _ffi.ffiModel.updateEventListener(sessionId, widget.id); diff --git a/flutter/lib/desktop/widgets/tabbar_widget.dart b/flutter/lib/desktop/widgets/tabbar_widget.dart index 2a7d1452e..2645ea0f2 100644 --- a/flutter/lib/desktop/widgets/tabbar_widget.dart +++ b/flutter/lib/desktop/widgets/tabbar_widget.dart @@ -582,8 +582,6 @@ class WindowActionPanelState extends State } await windowManager.hide(); } else { - renderTexture.destroy(); - // it's safe to hide the subwindow final controller = WindowController.fromWindowId(kWindowId!); if (Platform.isMacOS && await controller.isFullScreen()) { diff --git a/flutter/lib/models/desktop_render_texture.dart b/flutter/lib/models/desktop_render_texture.dart index 37d387eb2..f59373623 100644 --- a/flutter/lib/models/desktop_render_texture.dart +++ b/flutter/lib/models/desktop_render_texture.dart @@ -38,9 +38,4 @@ class RenderTexture { _textureKey = -1; } } - - static final RenderTexture instance = RenderTexture(); } - -// Global instance for separate texture -final renderTexture = RenderTexture.instance;