Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleMenuItem.cs18
1 files changed, 9 insertions, 9 deletions
diff --git a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleMenuItem.cs b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleMenuItem.cs
index 68eca066b5..b2053eaea7 100644
--- a/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleMenuItem.cs
+++ b/main/src/addins/WindowsPlatform/WindowsPlatform/MainToolbar/TitleMenuItem.cs
@@ -70,12 +70,6 @@ namespace WindowsPlatform.MainToolbar
Height = SystemParameters.CaptionHeight;
UseLayoutRounding = true;
-
- SubmenuClosing += (o, e) => {
- bool shouldFocusIde = !menu.Items.OfType<MenuItem> ().Any (mi => mi.IsSubmenuOpen);
- if (shouldFocusIde)
- IdeApp.Workbench.RootWindow.Present ();
- };
}
Menu menu;
@@ -212,7 +206,7 @@ namespace WindowsPlatform.MainToolbar
Clear ();
if (!closingSent) {
- SubmenuClosing?.Invoke (this, e);
+ OnSubmenuClosing ();
closingSent = false;
}
@@ -225,7 +219,7 @@ namespace WindowsPlatform.MainToolbar
return;
closingSent = true;
- SubmenuClosing?.Invoke (this, e);
+ OnSubmenuClosing ();
Xwt.Application.Invoke(() => {
if (commandArrayInfo != null) {
@@ -241,7 +235,13 @@ namespace WindowsPlatform.MainToolbar
DesktopService.ShowUrl (menuLinkEntry.Url);
}
- internal event EventHandler SubmenuClosing;
+ void OnSubmenuClosing ()
+ {
+ bool shouldFocusIde = !menu.Items.OfType<MenuItem> ().Any (mi => mi.IsSubmenuOpen);
+ if (shouldFocusIde)
+ IdeApp.Workbench.RootWindow.Present ();
+ }
+
readonly MonoDevelop.Components.Commands.CommandManager manager;
readonly object initialCommandTarget;
readonly CommandSource commandSource;