Skip to content
This repository has been archived by the owner on Oct 4, 2021. It is now read-only.

[release-8.3] Fix 988924: Some commands (save, undo) do not work if editor is detat… #9220

Open
wants to merge 1 commit into
base: release-8.3
Choose a base branch
from
Open

[release-8.3] Fix 988924: Some commands (save, undo) do not work if editor is detat… #9220

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
5 changes: 3 additions & 2 deletions main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2364,7 +2364,8 @@ Windows.GtkWPFWidget GetFocusedWpfWidget ()
Gtk.Widget GetFocusedChild (Control widget)
{
Gtk.Container container;

if (widget?.nativeWidget is AppKit.NSWindow window)
widget = Mac.GtkMacInterop.GetGtkWindow (window)?.Child;
do {
container = widget?.nativeWidget is Gtk.Container ? widget.GetNativeWidget<Gtk.Container> () : null;
if (container != null) {
Expand All @@ -2376,7 +2377,7 @@ Gtk.Widget GetFocusedChild (Control widget)
}
} while (container != null);

return widget.nativeWidget is Gtk.Widget ? widget : null;
return widget?.nativeWidget is Gtk.Widget ? widget : null;
}

#if MAC
Expand Down