diff options
Diffstat (limited to 'platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XLightBreakpointPropertiesPanel.java')
-rw-r--r-- | platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XLightBreakpointPropertiesPanel.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XLightBreakpointPropertiesPanel.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XLightBreakpointPropertiesPanel.java index 75cbb569ddfd..4e91c27f011d 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XLightBreakpointPropertiesPanel.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XLightBreakpointPropertiesPanel.java @@ -180,8 +180,15 @@ public class XLightBreakpointPropertiesPanel<B extends XBreakpointBase<?,?,?>> i myMainPanel.addFocusListener(new FocusAdapter() { @Override public void focusGained(FocusEvent event) { - if (myConditionComboBox != null) { - IdeFocusManager.findInstance().requestFocus(myConditionComboBox.getEditorComponent(), false); + JComponent compToFocus; + if (myConditionComboBox != null && myConditionComboBox.getComboBox().isEnabled()) { + compToFocus = myConditionComboBox.getEditorComponent(); + } + else { + compToFocus = myActionsPanel.getDefaultFocusComponent(); + } + if (compToFocus != null) { + IdeFocusManager.findInstance().requestFocus(compToFocus, false); } } }); |