Skip to content

Fix chat window not reopening after close #13

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
haefele merged 3 commits into from
Jan 10, 2026
Merged

Fix chat window not reopening after close #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6634b3d
Fix chat window not showing when reopened after being closed
claude Jan 10, 2026
4ff9145
Simplify chat window closing - remove hide workaround
claude Jan 10, 2026
fddf106
Remove unused ShowAndActivate method from ChatView
claude Jan 10, 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
3 changes: 2 additions & 1 deletion src/RemoteViewer.Client/Services/Dialogs/AvaloniaDialogService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ public IWindowHandle ShowChatWindow(ChatViewModel viewModel)
{
DataContext = viewModel
};
window.ShowAndActivate();
window.Show();
window.Activate();
return new WindowHandle(window);
});
}
Expand Down
37 changes: 4 additions & 33 deletions src/RemoteViewer.Client/Views/Chat/ChatView.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ namespace RemoteViewer.Client.Views.Chat;
public partial class ChatView : Window
{
private ChatViewModel? _viewModel;
private bool _forceClose;

public ChatView()
{
Expand All @@ -18,23 +17,6 @@ public ChatView()
this.Deactivated += this.OnDeactivated;
}

public void ForceClose()
{
this._forceClose = true;
this.Close();
}

public void ShowAndActivate()
{
this.Show();

// Restore from minimized state if needed
if (this.WindowState == WindowState.Minimized)
this.WindowState = WindowState.Normal;

this.Activate();
}

private void OnDataContextChanged(object? sender, EventArgs e)
{
if (this._viewModel is not null)
Expand Down Expand Up @@ -77,23 +59,12 @@ protected override void OnClosing(WindowClosingEventArgs e)
{
base.OnClosing(e);

if (this._forceClose)
if (this._viewModel is { } vm)
{
// Dispose ViewModel and cleanup
if (this._viewModel is { } vm)
{
vm.Messages.CollectionChanged -= this.Messages_CollectionChanged;
vm.Dispose();
}
return;
vm.Messages.CollectionChanged -= this.Messages_CollectionChanged;
vm.IsOpen = false;
vm.Dispose();
}

// Hide instead of close to preserve state
e.Cancel = true;
this.Hide();

if (this._viewModel is { } vm2)
vm2.IsOpen = false;
}

private void Messages_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
Expand Down