Skip to content

[DRAFT] Windows fullscreen handling #559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'dart:async';
import 'dart:io';
import 'dart:ui';

Expand All @@ -19,110 +20,175 @@ Future<void> main() async {
},
);

testWidgets('getBounds', (tester) async {
expect(
await windowManager.getBounds(),
isA<Rect>().having((r) => r.size, 'size', const Size(640, 480)),
group('Getters', () {
testWidgets('getBounds', (tester) async {
expect(
await windowManager.getBounds(),
isA<Rect>().having((r) => r.size, 'size', const Size(640, 480)),
);
});

testWidgets(
'isAlwaysOnBottom',
(tester) async {
expect(await windowManager.isAlwaysOnBottom(), isFalse);
},
skip: Platform.isMacOS || Platform.isWindows,
);
});

testWidgets(
'isAlwaysOnBottom',
(tester) async {
expect(await windowManager.isAlwaysOnBottom(), isFalse);
},
skip: Platform.isMacOS || Platform.isWindows,
);

testWidgets('isAlwaysOnTop', (tester) async {
expect(await windowManager.isAlwaysOnTop(), isFalse);
});
testWidgets('isAlwaysOnTop', (tester) async {
expect(await windowManager.isAlwaysOnTop(), isFalse);
});

testWidgets('isClosable', (tester) async {
expect(await windowManager.isClosable(), isTrue);
});
testWidgets('isClosable', (tester) async {
expect(await windowManager.isClosable(), isTrue);
});

testWidgets('isFocused', (tester) async {
expect(await windowManager.isFocused(), isTrue);
});
testWidgets('isFocused', (tester) async {
expect(await windowManager.isFocused(), isTrue);
});

testWidgets('isFullScreen', (tester) async {
expect(await windowManager.isFullScreen(), isFalse);
});
testWidgets('isFullScreen', (tester) async {
expect(await windowManager.isFullScreen(), isFalse);
});

testWidgets(
'hasShadow',
(tester) async {
expect(await windowManager.hasShadow(), isTrue);
},
skip: Platform.isLinux,
);
testWidgets(
'hasShadow',
(tester) async {
expect(await windowManager.hasShadow(), isTrue);
},
skip: Platform.isLinux,
);

testWidgets('isMaximizable', (tester) async {
expect(await windowManager.isMaximizable(), isTrue);
});
testWidgets('isMaximizable', (tester) async {
expect(await windowManager.isMaximizable(), isTrue);
});

testWidgets('isMaximized', (tester) async {
expect(await windowManager.isMaximized(), isFalse);
});
testWidgets('isMaximized', (tester) async {
expect(await windowManager.isMaximized(), isFalse);
});

testWidgets(
'isMinimizable',
(tester) async {
expect(await windowManager.isMinimizable(), isTrue);
},
skip: Platform.isMacOS,
);
testWidgets(
'isMinimizable',
(tester) async {
expect(await windowManager.isMinimizable(), isTrue);
},
skip: Platform.isMacOS,
);

testWidgets('isMinimized', (tester) async {
expect(await windowManager.isMinimized(), isFalse);
});
testWidgets('isMinimized', (tester) async {
expect(await windowManager.isMinimized(), isFalse);
});

testWidgets(
'isMovable',
(tester) async {
expect(await windowManager.isMovable(), isTrue);
},
skip: Platform.isLinux || Platform.isWindows,
);
testWidgets(
'isMovable',
(tester) async {
expect(await windowManager.isMovable(), isTrue);
},
skip: Platform.isLinux || Platform.isWindows,
);

testWidgets('getOpacity', (tester) async {
expect(await windowManager.getOpacity(), 1.0);
});
testWidgets('getOpacity', (tester) async {
expect(await windowManager.getOpacity(), 1.0);
});

testWidgets('getPosition', (tester) async {
expect(await windowManager.getPosition(), isA<Offset>());
});
testWidgets('getPosition', (tester) async {
expect(await windowManager.getPosition(), isA<Offset>());
});

testWidgets('isPreventClose', (tester) async {
expect(await windowManager.isPreventClose(), isFalse);
});
testWidgets('isPreventClose', (tester) async {
expect(await windowManager.isPreventClose(), isFalse);
});

testWidgets('isResizable', (tester) async {
expect(await windowManager.isResizable(), isTrue);
});
testWidgets('isResizable', (tester) async {
expect(await windowManager.isResizable(), isTrue);
});

testWidgets('getSize', (tester) async {
expect(await windowManager.getSize(), const Size(640, 480));
});
testWidgets('getSize', (tester) async {
expect(await windowManager.getSize(), const Size(640, 480));
});

testWidgets(
'isSkipTaskbar',
(tester) async {
expect(await windowManager.isSkipTaskbar(), isFalse);
},
skip: Platform.isWindows,
);
testWidgets(
'isSkipTaskbar',
(tester) async {
expect(await windowManager.isSkipTaskbar(), isFalse);
},
skip: Platform.isWindows,
);

testWidgets('getTitle', (tester) async {
expect(await windowManager.getTitle(), 'window_manager_test');
testWidgets('getTitle', (tester) async {
expect(await windowManager.getTitle(), 'window_manager_test');
});

testWidgets('getTitleBarHeight', (tester) async {
expect(await windowManager.getTitleBarHeight(), isNonNegative);
});

testWidgets('isVisible', (tester) async {
expect(await windowManager.isVisible(), isTrue);
});
});

group('Setters and Listeners', () {
late StreamController<String> streamController;
late WindowListener windowListener;

setUp(() async {
streamController = StreamController<String>();
windowListener = WindowListenerImpl(streamController: streamController);
windowManager.addListener(windowListener);
});

tearDown(() async {
windowManager.removeListener(windowListener);
await streamController.close();
});

testWidgets('minimize & restore', (tester) async {
await windowManager.minimize();
await windowManager.restore();
expect(
streamController.stream,
emitsInOrder([
emitsThrough('minimize'),
emitsThrough('restore'),
]),
);
});

testWidgets('maximize & unmaximize', (tester) async {
await windowManager.maximize();
await windowManager.unmaximize();
expect(
streamController.stream,
emitsInOrder([
emitsThrough('maximize'),
emitsThrough('unmaximize'),
]),
);
});

testWidgets('setFullscreen true & false', (tester) async {
await windowManager.setFullScreen(true);
await windowManager.setFullScreen(false);
expect(
streamController.stream,
emitsInOrder([
emitsThrough('enter-full-screen'),
emitsThrough('leave-full-screen'),
]),
);
});
});
}

testWidgets('getTitleBarHeight', (tester) async {
expect(await windowManager.getTitleBarHeight(), isNonNegative);
});
class WindowListenerImpl with WindowListener {
WindowListenerImpl({required this.streamController});

testWidgets('isVisible', (tester) async {
expect(await windowManager.isVisible(), isTrue);
});
final StreamController<String> streamController;

@override
void onWindowEvent(String eventName) {
streamController.add(eventName);
}
}
1 change: 1 addition & 0 deletions packages/window_manager/windows/window_manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,7 @@ void WindowManager::SetFullScreen(const flutter::EncodableMap& args) {
::GetWindowPlacement(mainWindow, &placement);
::GetMonitorInfo(
::MonitorFromWindow(mainWindow, MONITOR_DEFAULTTONEAREST), &monitor);
// TODO: Check how frame can be restored after leaving fullscreen, when always enable frameless
if (!g_maximized_before_fullscreen) {
SetAsFrameless();
}
Expand Down
4 changes: 2 additions & 2 deletions packages/window_manager/windows/window_manager_plugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -289,11 +289,11 @@ std::optional<LRESULT> WindowManagerPlugin::HandleWindowProc(HWND hWnd,
rect->bottom = bottom;
}
} else if (message == WM_SIZE) {
if (window_manager->IsFullScreen() && wParam == SIZE_MAXIMIZED &&
if (window_manager->IsFullScreen() &&
window_manager->last_state != STATE_FULLSCREEN_ENTERED) {
_EmitEvent("enter-full-screen");
window_manager->last_state = STATE_FULLSCREEN_ENTERED;
} else if (!window_manager->IsFullScreen() && wParam == SIZE_RESTORED &&
} else if (!window_manager->IsFullScreen() &&
window_manager->last_state == STATE_FULLSCREEN_ENTERED) {
window_manager->ForceChildRefresh();
_EmitEvent("leave-full-screen");
Expand Down