Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Intellij Community
Commits
e23d6032
Commit
e23d6032
authored
10 years ago
by
Konstantin Bulenkov
Browse files
Options
Download
Email Patches
Plain Diff
cell editing cancellation should be handled by LaF
parent
0af9dcd7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
+4
-15
...atform-api/src/com/intellij/openapi/ui/DialogWrapper.java
with
4 additions
and
15 deletions
+4
-15
platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
+
4
-
15
View file @
e23d6032
...
@@ -37,7 +37,10 @@ import com.intellij.openapi.util.text.StringUtil;
...
@@ -37,7 +37,10 @@ import com.intellij.openapi.util.text.StringUtil;
import
com.intellij.openapi.wm.IdeFocusManager
;
import
com.intellij.openapi.wm.IdeFocusManager
;
import
com.intellij.openapi.wm.IdeGlassPaneUtil
;
import
com.intellij.openapi.wm.IdeGlassPaneUtil
;
import
com.intellij.openapi.wm.WindowManager
;
import
com.intellij.openapi.wm.WindowManager
;
import
com.intellij.ui.*
;
import
com.intellij.ui.ColorUtil
;
import
com.intellij.ui.IdeBorderFactory
;
import
com.intellij.ui.JBColor
;
import
com.intellij.ui.UIBundle
;
import
com.intellij.ui.border.CustomLineBorder
;
import
com.intellij.ui.border.CustomLineBorder
;
import
com.intellij.ui.components.JBOptionButton
;
import
com.intellij.ui.components.JBOptionButton
;
import
com.intellij.ui.components.JBScrollPane
;
import
com.intellij.ui.components.JBScrollPane
;
...
@@ -1676,20 +1679,6 @@ public abstract class DialogWrapper {
...
@@ -1676,20 +1679,6 @@ public abstract class DialogWrapper {
}
}
final
StackingPopupDispatcher
popupDispatcher
=
StackingPopupDispatcher
.
getInstance
();
final
StackingPopupDispatcher
popupDispatcher
=
StackingPopupDispatcher
.
getInstance
();
if
(
popupDispatcher
!=
null
&&
!
popupDispatcher
.
isPopupFocused
())
{
if
(
popupDispatcher
!=
null
&&
!
popupDispatcher
.
isPopupFocused
())
{
Component
focusOwner
=
KeyboardFocusManager
.
getCurrentKeyboardFocusManager
().
getFocusOwner
();
JTree
tree
=
UIUtil
.
getParentOfType
(
JTree
.
class
,
focusOwner
);
JTable
table
=
UIUtil
.
getParentOfType
(
JTable
.
class
,
focusOwner
);
if
(
tree
!=
null
&&
tree
.
isEditing
())
{
tree
.
cancelEditing
();
return
;
}
if
(
table
!=
null
&&
table
.
isEditing
())
{
TableUtil
.
stopEditing
(
table
);
return
;
}
doCancelAction
(
e
);
doCancelAction
(
e
);
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment