Skip to content

fix: resolve GUI responsiveness and window state issues #184

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

Open
ricred wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: resolve GUI responsiveness and window state issues #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
67 changes: 34 additions & 33 deletions src/App.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,50 +323,53 @@ private void OnNotifyIconClick(object sender, System.Windows.Forms.MouseEventArg
if (MainWindow.OwnedWindows.Cast<View>().Any(window => window != null && window.IsDialog))
{
MainWindow.Activate();
MainWindow.Topmost = true;
MainWindow.Topmost = Settings.AlwaysOnTop;

return;
}

switch (MainWindow.Visibility)
// Determine current window state
bool isWindowVisible = MainWindow.Visibility == Visibility.Visible;
bool isWindowMinimized = MainWindow.WindowState == WindowState.Minimized;
bool isWindowHidden = MainWindow.Visibility == Visibility.Hidden || MainWindow.Visibility == Visibility.Collapsed;

if (!isWindowVisible || isWindowMinimized)
{
case Visibility.Collapsed:
case Visibility.Hidden:
MainWindow.Show();
// Restore window properly
MainWindow.ShowInTaskbar = true;

if (isWindowMinimized)
{
MainWindow.WindowState = WindowState.Normal;
}
else if (isWindowHidden)
{
MainWindow.Show();
}

MainWindow.Activate();
MainWindow.Focus();
MainWindow.Activate();
MainWindow.Focus();

MainWindow.Topmost = true;
MainWindow.Topmost = Settings.AlwaysOnTop;
MainWindow.ShowInTaskbar = true;
// Focus the Optimize button when restoring from notification area
MainWindow.Dispatcher.BeginInvoke((Action)(() =>
{
var mainWindow = MainWindow as MainWindow;

// Focus the Optimize button when restoring from notification area
MainWindow.Dispatcher.BeginInvoke((Action)(() =>
if (mainWindow != null)
{
var mainWindow = MainWindow as MainWindow;
var optimizeButton = mainWindow.FindName("Optimize") as UIElement;

if (mainWindow != null)
if (optimizeButton != null)
{
var optimizeButton = mainWindow.FindName("Optimize") as UIElement;

if (optimizeButton != null)
{
Keyboard.Focus(optimizeButton);
FocusManager.SetFocusedElement(mainWindow, optimizeButton);
}
Keyboard.Focus(optimizeButton);
FocusManager.SetFocusedElement(mainWindow, optimizeButton);
}
}), DispatcherPriority.ApplicationIdle);
break;

case Visibility.Visible:
MainWindow.Hide();

MainWindow.ShowInTaskbar = false;
break;
}
}), DispatcherPriority.ApplicationIdle);
}
else
{
// Hide window
MainWindow.Hide();
MainWindow.ShowInTaskbar = false;
}

ReleaseMemory();
Expand Down Expand Up @@ -485,8 +488,6 @@ protected override void OnStartup(StartupEventArgs startupEvent)
mainWindow.Show();
mainWindow.Activate();
mainWindow.Focus();
mainWindow.Topmost = true;
mainWindow.Topmost = Settings.AlwaysOnTop;
}

// Subscribe to power events
Expand Down
16 changes: 15 additions & 1 deletion src/Core/ObservableObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.Linq.Expressions;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Windows;

namespace WinMemoryCleaner
{
Expand Down Expand Up @@ -30,7 +31,20 @@ public abstract class ObservableObject : INotifyPropertyChanged
public void RaisePropertyChanged([CallerMemberName] string propertyName = null)
{
if (PropertyChanged != null)
PropertyChanged.Invoke(this, new PropertyChangedEventArgs(propertyName));
{
var handler = PropertyChanged;
var args = new PropertyChangedEventArgs(propertyName);

// Marshal to UI thread if necessary
if (Application.Current != null && Application.Current.Dispatcher != null && !Application.Current.Dispatcher.CheckAccess())
{
Application.Current.Dispatcher.Invoke(handler, this, args);
}
else
{
handler.Invoke(this, args);
}
}
}

/// <summary>
Expand Down
11 changes: 9 additions & 2 deletions src/View/Window/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Input;
using System.Windows.Threading;

namespace WinMemoryCleaner
{
Expand Down Expand Up @@ -213,8 +214,14 @@ private void OnOptimizeCommandCompleted()
}
else
{
Thread.Sleep(1000);
App.Shutdown();
// Use DispatcherTimer to avoid blocking the UI thread
var timer = new DispatcherTimer { Interval = TimeSpan.FromMilliseconds(1000) };
timer.Tick += (s, e) =>
{
timer.Stop();
App.Shutdown();
};
timer.Start();
}
}
else
Expand Down
Loading