MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Wrong foreground when already unfocused fixed

Browse Source
This commit is contained in:
Nadya Zabrodina
2014-11-27 17:01:12 +03:00
parent 195377ae63
commit c689a0c511
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/dvcs-impl/src/com/intellij/dvcs/push/ui/PushLog.java
+11
View File
@@ -159,6 +159,17 @@ public class PushLog extends JPanel implements TypeSafeDataProvider {
updateChangesView();
}
});
myTree.addFocusListener(new FocusAdapter() {
@Override
public void focusLost(FocusEvent e) {
DefaultMutableTreeNode node = (DefaultMutableTreeNode)myTree.getLastSelectedPathComponent();
if (node != null && node instanceof RepositoryNode && myTree.isEditing()) {
//need to force repaint foreground for non-focused editing node
myTree.getCellEditor().getTreeCellEditorComponent(myTree, node, true, false, false, myTree.getRowForPath(
TreeUtil.getPathFromRoot(node)));
}
}
});
myTree.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_F2, 0), START_EDITING);
//override default tree behaviour.
myTree.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "");
platform/dvcs-impl/src/com/intellij/dvcs/push/ui/RepositoryWithBranchPanel.java
+4 -6
View File
@@ -161,7 +161,10 @@ public class RepositoryWithBranchPanel<T extends PushTarget> extends NonOpaquePa
if (bounds != null) {
setPreferredSize(new Dimension(tree.getVisibleRect().width - bounds.x, bounds.height));
}
myDestPushTargetPanelComponent.requestFocus();
if (myTextRenderer.getTree().hasFocus()) {
//delegate focus from tree to editable component if needed
myDestPushTargetPanelComponent.requestFocus(true);
}
revalidate();
return this;
}
@@ -218,11 +221,6 @@ public class RepositoryWithBranchPanel<T extends PushTarget> extends NonOpaquePa
return myCheckBoxLoadingIconGapV;
}
public int getVBorderOffset(@NotNull SimpleColoredComponent coloredRenderer) {
Border border = coloredRenderer.getMyBorder();
return border != null ? border.getBorderInsets(coloredRenderer).top : 0;
}
public int getCheckBoxHeight() {
return myCheckBoxHeight;
}