Merge pull request #5600 from fufesou/fix/mobile_connecting_canvas_color

fix, mobile connecting canvas color
This commit is contained in:
RustDesk 2023-09-04 23:23:42 +08:00 committed by GitHub
commit 58bbc33aa6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -92,12 +92,16 @@ class _RemotePageState extends State<RemotePage> {
removeSharedStates(widget.id); removeSharedStates(widget.id);
} }
Widget emptyOverlay() => BlockableOverlay( // to-do: It should be better to use transparent color instead of the bgColor.
// But for now, the transparent color will cause the canvas to be white.
// I'm sure that the white color is caused by the Overlay widget in BlockableOverlay.
// But I don't know why and how to fix it.
Widget emptyOverlay(Color bgColor) => BlockableOverlay(
/// the Overlay key will be set with _blockableOverlayState in BlockableOverlay /// the Overlay key will be set with _blockableOverlayState in BlockableOverlay
/// see override build() in [BlockableOverlay] /// see override build() in [BlockableOverlay]
state: _blockableOverlayState, state: _blockableOverlayState,
underlying: Container( underlying: Container(
color: Colors.transparent, color: bgColor,
), ),
); );
@ -265,13 +269,13 @@ class _RemotePageState extends State<RemotePage> {
children: [ children: [
gFFI.ffiModel.pi.isSet.isTrue && gFFI.ffiModel.pi.isSet.isTrue &&
gFFI.ffiModel.waitForFirstImage.isTrue gFFI.ffiModel.waitForFirstImage.isTrue
? emptyOverlay() ? emptyOverlay(MyTheme.canvasColor)
: () { : () {
gFFI.ffiModel.tryShowAndroidActionsOverlay(); gFFI.ffiModel.tryShowAndroidActionsOverlay();
return Offstage(); return Offstage();
}(), }(),
_bottomWidget(), _bottomWidget(),
gFFI.ffiModel.pi.isSet.isFalse ? emptyOverlay() : Offstage(), gFFI.ffiModel.pi.isSet.isFalse ? emptyOverlay(MyTheme.canvasColor) : Offstage(),
], ],
)), )),
body: Overlay( body: Overlay(