mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 22:22:11 +02:00
Code Issues Wiki Activity

Terminals: Keep context menu from being disposed if terminal is disposed

Browse source 
Related to Bug 458625.
This commit is contained in:
Anton Leherbauer 2015-02-24 17:02:09 +01:00
parent 5f9c9c21a2
commit 0b4533ee5d
3 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabDisposeListener.java
View file

@ -54,7 +54,12 @@ public class TabDisposeListener implements DisposeListener {
if (e.getSource() instanceof CTabItem) { if (e.getSource() instanceof CTabItem) {
// Get the terminal control (if any) from the tab item // Get the terminal control (if any) from the tab item
Object candidate = ((CTabItem)e.getSource()).getData(); Object candidate = ((CTabItem)e.getSource()).getData();
if (candidate instanceof ITerminalViewControl) ((ITerminalViewControl)candidate).disposeTerminal(); if (candidate instanceof ITerminalViewControl) {
ITerminalViewControl terminal = (ITerminalViewControl)candidate;
// Keep the context menu from being disposed
terminal.getControl().setMenu(null);
terminal.disposeTerminal();
}
// Dispose the command input field handler // Dispose the command input field handler
parentTabFolderManager.disposeTabCommandFieldHandler((CTabItem)e.getSource()); parentTabFolderManager.disposeTabCommandFieldHandler((CTabItem)e.getSource());
// Dispose the tab item control // Dispose the tab item control

3
plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabFolderManager.java
View file

@ -378,6 +378,9 @@ public class TabFolderManager extends PlatformObject implements ISelectionProvid
// Remember terminal state // Remember terminal state
TerminalState oldState = terminal.getState(); TerminalState oldState = terminal.getState();
// Keep the context menu from being disposed
terminal.getControl().setMenu(null);
// change the "parent". // change the "parent".
Assert.isTrue(terminal instanceof ITerminalControl); Assert.isTrue(terminal instanceof ITerminalControl);
((ITerminalControl)terminal).setupTerminal(composite); ((ITerminalControl)terminal).setupTerminal(composite);

4
plugins/org.eclipse.tcf.te.ui.terminals/src/org/eclipse/tcf/te/ui/terminals/tabs/TabFolderMenuHandler.java
View file

@ -371,6 +371,10 @@ public class TabFolderMenuHandler extends PlatformObject {
if (MenuManager.class.isAssignableFrom(adapter)) { if (MenuManager.class.isAssignableFrom(adapter)) {
return contextMenuManager; return contextMenuManager;
} else if (Menu.class.isAssignableFrom(adapter)) { } else if (Menu.class.isAssignableFrom(adapter)) {
if (contextMenu != null && contextMenu.isDisposed()) {
// menu got disposed (should not happen)
contextMenu = contextMenuManager.createContextMenu(getTabFolder());
}
return contextMenu; return contextMenu;
} }