mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-08 09:35:23 +02:00
Code Issues Wiki Activity

Fix bug 153271: pressing enter in content assist should not send the command

Browse source
This commit is contained in:
Martin Oberhuber 2006-08-29 09:26:45 +00:00
parent 80704617ff
commit 579aa49ba5
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/CommandsViewPage.java
View file

@ -57,7 +57,6 @@ import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Label;
@ -82,12 +81,13 @@ FocusListener
{ {
private boolean checkState(Event event) private boolean checkState(Event event)
{ {
boolean isEnabled = !_inputEntry.isInCodeAssist();
if (event.character == '\r') if (event.character == '\r')
{ {
_inputEntry.setInCodeAssist(false); _inputEntry.setInCodeAssist(false);
} }
return !_inputEntry.isInCodeAssist(); return isEnabled;
} }
public void handleEvent(Event e) public void handleEvent(Event e)
@ -113,7 +113,7 @@ FocusListener
} }
else if (e.stateMask == 262144) else if (e.stateMask == 262144)
{ {
if (((int)e.character) == 3) if (e.character == 3)
{ {
if (_inputEntry.getSelectedText().length() == 0) if (_inputEntry.getSelectedText().length() == 0)
{ {
@ -254,7 +254,7 @@ FocusListener
Table table = _viewer.getTable(); Table table = _viewer.getTable();
Display display = _viewer.getShell().getDisplay(); //Display display = _viewer.getShell().getDisplay();
Color bgcolour = _tabFolderPage.getBackground(); Color bgcolour = _tabFolderPage.getBackground();
table.setBackground(bgcolour); table.setBackground(bgcolour);
@ -336,7 +336,7 @@ FocusListener
} }
public void updateTheme() public void updateTheme()
{ {
Display display = getViewer().getControl().getDisplay(); //Display display = getViewer().getControl().getDisplay();
IThemeManager mgr = PlatformUI.getWorkbench().getThemeManager(); IThemeManager mgr = PlatformUI.getWorkbench().getThemeManager();
Color bg = mgr.getCurrentTheme().getColorRegistry().get(REMOTE_COMMANDS_VIEW_BG_COLOR); Color bg = mgr.getCurrentTheme().getColorRegistry().get(REMOTE_COMMANDS_VIEW_BG_COLOR);
Color fg = mgr.getCurrentTheme().getColorRegistry().get(REMOTE_COMMANDS_VIEW_FG_COLOR); Color fg = mgr.getCurrentTheme().getColorRegistry().get(REMOTE_COMMANDS_VIEW_FG_COLOR);
@ -355,7 +355,7 @@ FocusListener
return; return;
ISystemViewElementAdapter adapter = (ISystemViewElementAdapter) ((IAdaptable) element).getAdapter(ISystemViewElementAdapter.class); ISystemViewElementAdapter adapter = (ISystemViewElementAdapter) ((IAdaptable) element).getAdapter(ISystemViewElementAdapter.class);
boolean alreadyHandled = false; //boolean alreadyHandled = false;
if (adapter != null) if (adapter != null)
{ {
if (adapter.hasChildren(element)) if (adapter.hasChildren(element))
@ -399,12 +399,12 @@ FocusListener
} }
else else
{ {
alreadyHandled = adapter.handleDoubleClick(element); /*alreadyHandled =*/ adapter.handleDoubleClick(element);
} }
} }
else else
{ {
alreadyHandled = adapter.handleDoubleClick(element); /*alreadyHandled =*/ adapter.handleDoubleClick(element);
} }
} }
} }