|
@@ -120,12 +120,14 @@ namespace Terminal.Gui.MenuTests {
|
|
new MenuItem ("_Copy", "Copies the selection.", Copy)
|
|
new MenuItem ("_Copy", "Copies the selection.", Copy)
|
|
});
|
|
});
|
|
};
|
|
};
|
|
- menu.MenuOpened += (e) => {
|
|
|
|
- Assert.Equal ("_Edit", e.Parent.Title);
|
|
|
|
- Assert.Equal ("_Copy", e.Title);
|
|
|
|
- Assert.Equal ("Copies the selection.", e.Help);
|
|
|
|
- Assert.Equal (Copy, e.Action);
|
|
|
|
- e.Action ();
|
|
|
|
|
|
+ menu.MenuOpened += (s, e) => {
|
|
|
|
+ var mi = e.MenuItem;
|
|
|
|
+
|
|
|
|
+ Assert.Equal ("_Edit", mi.Parent.Title);
|
|
|
|
+ Assert.Equal ("_Copy", mi.Title);
|
|
|
|
+ Assert.Equal ("Copies the selection.", mi.Help);
|
|
|
|
+ Assert.Equal (Copy, mi.Action);
|
|
|
|
+ mi.Action ();
|
|
Assert.Equal ("Copy", miAction);
|
|
Assert.Equal ("Copy", miAction);
|
|
};
|
|
};
|
|
menu.MenuClosing += (s,e) => {
|
|
menu.MenuClosing += (s,e) => {
|
|
@@ -194,8 +196,8 @@ Edit
|
|
new MenuItem ("_Save", "Saves the file.", null, null)
|
|
new MenuItem ("_Save", "Saves the file.", null, null)
|
|
})
|
|
})
|
|
});
|
|
});
|
|
- menu.MenuOpened += (e) => {
|
|
|
|
- miCurrent = e;
|
|
|
|
|
|
+ menu.MenuOpened += (s,e) => {
|
|
|
|
+ miCurrent = e.MenuItem;
|
|
mCurrent = menu.openMenu;
|
|
mCurrent = menu.openMenu;
|
|
};
|
|
};
|
|
menu.UseKeysUpDownAsKeysLeftRight = true;
|
|
menu.UseKeysUpDownAsKeysLeftRight = true;
|
|
@@ -290,8 +292,8 @@ Edit
|
|
new MenuItem ("_Paste", "", null)
|
|
new MenuItem ("_Paste", "", null)
|
|
})
|
|
})
|
|
});
|
|
});
|
|
- menu.MenuOpened += (e) => {
|
|
|
|
- miCurrent = e;
|
|
|
|
|
|
+ menu.MenuOpened += (s, e) => {
|
|
|
|
+ miCurrent = e.MenuItem;
|
|
mCurrent = menu.openCurrentMenu;
|
|
mCurrent = menu.openCurrentMenu;
|
|
};
|
|
};
|
|
Application.Top.Add (menu);
|
|
Application.Top.Add (menu);
|
|
@@ -379,8 +381,8 @@ Edit
|
|
new MenuBarItem ("_About", "Top-Level", () => miAction ="About")
|
|
new MenuBarItem ("_About", "Top-Level", () => miAction ="About")
|
|
});
|
|
});
|
|
menu.MenuOpening += (s,e) => mbiCurrent = e.CurrentMenu;
|
|
menu.MenuOpening += (s,e) => mbiCurrent = e.CurrentMenu;
|
|
- menu.MenuOpened += (e) => {
|
|
|
|
- miCurrent = e;
|
|
|
|
|
|
+ menu.MenuOpened += (s, e) => {
|
|
|
|
+ miCurrent = e.MenuItem;
|
|
mCurrent = menu.openCurrentMenu;
|
|
mCurrent = menu.openCurrentMenu;
|
|
};
|
|
};
|
|
menu.MenuClosing += (s,e) => {
|
|
menu.MenuClosing += (s,e) => {
|