Skip to content

refactor: Enhance window initialization and logging in AppWindow class #39

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.

Sign up for GitHub

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

Merged
rgdevment merged 2 commits into from
Apr 20, 2026
Merged

refactor: Enhance window initialization and logging in AppWindow class #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06cc945
refactor: Enhance window initialization and logging in AppWindow class
rgdevment Apr 20, 2026
2ae9097
refactor: Simplify variable naming and improve formatting in main.dar…
rgdevment Apr 20, 2026
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
17 changes: 13 additions & 4 deletions app/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,11 @@ void main() async {

await windowManager.ensureInitialized();

bool acrylicInitialized = false;
if (Platform.isWindows || Platform.isMacOS) {
try {
await Window.initialize();
await Window.initialize().timeout(const Duration(seconds: 3));
acrylicInitialized = true;
} catch (_) {
// AppLogger not yet initialized here; app continues without acrylic effects
}
Expand All @@ -62,6 +64,11 @@ void main() async {
final storage = await StorageConfig.create();
await storage.ensureDirectories();
AppLogger.initialize(storage.logsPath);
AppLogger.info(
'Startup: platform=${Platform.operatingSystem}, '
'version=${Platform.operatingSystemVersion}, '
'acrylicInit=$acrylicInitialized',
);

FlutterError.onError = (details) {
AppLogger.error(
Expand Down Expand Up @@ -95,20 +102,22 @@ void main() async {

try {
if (Platform.isWindows) {
AppLogger.info('main: applying initial Mica effect');
await Window.setEffect(
effect: WindowEffect.mica,
color: const Color(0x00000000),
dark: _isMicaDark(config.themeMode),
);
).timeout(const Duration(seconds: 2));
AppLogger.info('main: Mica effect applied');
} else if (Platform.isMacOS) {
await Window.setEffect(
effect: WindowEffect.sidebar,
color: const Color(0x00000000),
dark: _isMicaDark(config.themeMode),
);
).timeout(const Duration(seconds: 2));
}
} catch (e) {
AppLogger.error('Window.setEffect failed: $e');
AppLogger.warn('main: Window.setEffect failed (non-fatal): $e');
}

runApp(
Expand Down
96 changes: 66 additions & 30 deletions app/lib/shell/app_window.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,36 +84,66 @@ class AppWindow {
}

Future<void> init({bool startVisible = false}) async {
await windowManager.waitUntilReadyToShow(null, () async {
await windowManager.setTitle('CopyPaste');
await windowManager.setSize(Size(_popupWidth, _popupHeight));
await windowManager.setMinimumSize(Size(_popupWidth, 400));
await windowManager.setMaximumSize(Size(_popupWidth, 900));
await windowManager.setTitleBarStyle(
TitleBarStyle.hidden,
windowButtonVisibility: !Platform.isMacOS,
AppLogger.info(
'AppWindow.init: startVisible=$startVisible, '
'showInTaskbar=$showInTaskbar, '
'size=${_popupWidth}x$_popupHeight',
);
try {
await windowManager
.waitUntilReadyToShow(null, () async {
await _configureWindow(startVisible);
})
.timeout(const Duration(seconds: 5));
AppLogger.info('AppWindow.init: waitUntilReadyToShow completed');
} catch (e) {
AppLogger.warn(
'AppWindow.init: waitUntilReadyToShow failed ($e), '
'attempting direct configuration',
);
await windowManager.setAlwaysOnTop(true);
await windowManager.setResizable(false);
await windowManager.setMaximizable(false);
await windowManager.setPreventClose(true);
final inTaskbar = showInTaskbar && Platform.isWindows;
await windowManager.setSkipTaskbar(!inTaskbar);
if (Platform.isWindows || Platform.isMacOS) {
await windowManager.setBackgroundColor(const Color(0x00000000));
await applyEffect();
try {
await _configureWindow(startVisible);
AppLogger.info('AppWindow.init: direct configuration succeeded');
} catch (e2) {
AppLogger.error('Window configuration failed: $e2');
}
if (startVisible) {
await windowManager.center();
await windowManager.focus();
} else if (inTaskbar) {
await windowManager.minimize();
} else {
await windowManager.hide();
}
});
}
_visible = startVisible;
_ready = true;
AppLogger.info('AppWindow.init: done, ready=$_ready, visible=$_visible');
}

Future<void> _configureWindow(bool startVisible) async {
await windowManager.setTitle('CopyPaste');
await windowManager.setSize(Size(_popupWidth, _popupHeight));
await windowManager.setMinimumSize(Size(_popupWidth, 400));
await windowManager.setMaximumSize(Size(_popupWidth, 900));
await windowManager.setTitleBarStyle(
TitleBarStyle.hidden,
windowButtonVisibility: !Platform.isMacOS,
);
await windowManager.setAlwaysOnTop(true);
await windowManager.setResizable(false);
await windowManager.setMaximizable(false);
await windowManager.setPreventClose(true);
final inTaskbar = showInTaskbar && Platform.isWindows;
await windowManager.setSkipTaskbar(!inTaskbar);
if (Platform.isWindows || Platform.isMacOS) {
await windowManager.setBackgroundColor(const Color(0x00000000));
AppLogger.info('_configureWindow: applying initial effect');
await applyEffect();
}
if (startVisible) {
AppLogger.info('_configureWindow: centering and focusing');
await windowManager.center();
await windowManager.focus();
} else if (inTaskbar) {
AppLogger.info('_configureWindow: minimizing to taskbar');
await windowManager.minimize();
} else {
AppLogger.info('_configureWindow: hiding window');
await windowManager.hide();
}
}

bool _isDark = false;
Expand All @@ -126,13 +156,13 @@ class AppWindow {
effect: WindowEffect.mica,
color: const Color(0x00000000),
dark: _isDark,
);
).timeout(const Duration(seconds: 2));
} else if (Platform.isMacOS) {
await Window.setEffect(
effect: WindowEffect.sidebar,
color: const Color(0x00000000),
dark: _isDark,
);
).timeout(const Duration(seconds: 2));
}
} catch (e) {
// Effect failure is non-fatal — app runs without the acrylic effect.
Expand Down Expand Up @@ -282,6 +312,7 @@ class AppWindow {
}

Future<void> show() async {
AppLogger.info('AppWindow.show: starting');
if (Platform.isLinux) {
// On X11/GTK, show the window first (so it gets realized/mapped by the WM),
// then set the position (avoids WM initial-placement overriding our offset),
Expand All @@ -294,11 +325,14 @@ class AppWindow {
} else {
await _positionNearCursor();
if (Platform.isWindows) {
await applyEffect();
await windowManager.setSkipTaskbar(false);
}
await windowManager.show();
await windowManager.focus();
AppLogger.info('AppWindow.show: window shown and focused');
if (Platform.isWindows) {
await applyEffect();
}
}
_visible = true;
onVisibilityChanged?.call(true);
Expand Down Expand Up @@ -375,16 +409,18 @@ class AppWindow {
bool get isGateMode => _gateMode;

Future<void> enterGateMode() async {
AppLogger.info('AppWindow.enterGateMode: starting');
_gateMode = true;
await windowManager.setResizable(false);
await windowManager.setMinimumSize(const Size(_gateWidth, _gateHeight));
await windowManager.setMaximumSize(const Size(_gateWidth, _gateHeight));
await windowManager.setSize(const Size(_gateWidth, _gateHeight));
await windowManager.setAlwaysOnTop(false);
await windowManager.show();
await windowManager.center();
await windowManager.show();
await windowManager.focus();
_visible = true;
AppLogger.info('AppWindow.enterGateMode: done');
}

Future<void> exitGateMode() async {
Expand Down
Loading