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

Merge branch 'tree-fixes'

Browse Source
This commit is contained in:
Kirill Kalishev
2009-11-02 15:31:27 +03:00
parent 45d9439622 3937fe3564
commit 6e52b45cdc
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyTreeBuilder.java
+2
View File
@@ -80,6 +80,8 @@ public class HierarchyTreeBuilder extends AbstractTreeBuilder {
}
protected boolean isAutoExpandNode(final NodeDescriptor nodeDescriptor) {
if (getTreeStructure().getRootElement().equals(nodeDescriptor.getElement())) return true;
if (nodeDescriptor instanceof HierarchyNodeDescriptor) {
return false;
}
platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ContentComboLabel.java
+2 -9
View File
@@ -15,22 +15,14 @@
*/
package com.intellij.openapi.wm.impl.content;
import com.intellij.openapi.ui.popup.JBPopupFactory;
import com.intellij.openapi.ui.popup.ListPopup;
import com.intellij.openapi.ui.popup.PopupStep;
import com.intellij.openapi.ui.popup.util.BaseListPopupStep;
import com.intellij.ui.content.Content;
import com.intellij.ui.content.ContentManager;
import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import javax.swing.border.Border;
import javax.swing.border.EmptyBorder;
import java.awt.*;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.Arrays;
public class ContentComboLabel extends BaseLabel {
@@ -92,7 +84,8 @@ public class ContentComboLabel extends BaseLabel {
int width = 0;
for (int i = 0; i < myUi.myManager.getContentCount(); i++) {
String text = myUi.myManager.getContent(i).getDisplayName();
int eachTextWidth = getFontMetrics(getFont()).stringWidth(text);
FontMetrics metrics = getFontMetrics(getFont());
int eachTextWidth = metrics.stringWidth(text != null ? text : "");
width = Math.max(eachTextWidth, width);
}