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

cleanup

Browse Source
This commit is contained in:
Gregory.Shrago
2016-04-21 16:18:29 +03:00
parent bfae071f81
commit 866aa789a8
2 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/ui/LayeredIcon.java
-14
View File
@@ -49,20 +49,6 @@ public class LayeredIcon extends AbstractSizeAdjustingIcon {
}
}
public static LayeredIcon createHorizontalIcon(@NotNull Icon... icons) {
LayeredIcon result = new LayeredIcon(icons.length);
int maxHeight = 0;
for (Icon icon : icons) {
maxHeight = Math.max(maxHeight, icon.getIconHeight());
}
int hShift = 0;
for (int i = 0; i < icons.length; i++) {
result.setIcon(icons[i], i, hShift, (maxHeight - icons[i].getIconHeight()) / 2);
hShift += icons[i].getIconWidth() + 1;
}
return result;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
platform/lang-impl/src/com/intellij/ide/bookmarks/BookmarksFavoriteListProvider.java
+7 -2
View File
@@ -23,7 +23,8 @@ import com.intellij.ide.util.treeView.AbstractTreeNode;
import com.intellij.openapi.project.Project;
import com.intellij.ui.ColoredTreeCellRenderer;
import com.intellij.ui.CommonActionsPanel;
import com.intellij.ui.LayeredIcon;
import com.intellij.ui.RowIcon;
import com.intellij.util.ui.EmptyIcon;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -194,7 +195,11 @@ public class BookmarksFavoriteListProvider extends AbstractFavoritesListProvider
Bookmark bookmark = (Bookmark)value;
BookmarkItem.setupRenderer(renderer, myProject, bookmark, selected);
if (renderer.getIcon() != null) {
renderer.setIcon(LayeredIcon.createHorizontalIcon(bookmark.getIcon(), renderer.getIcon()));
RowIcon icon = new RowIcon(3, RowIcon.Alignment.CENTER);
icon.setIcon(bookmark.getIcon(), 0);
icon.setIcon(EmptyIcon.create(1), 1);
icon.setIcon(renderer.getIcon(), 2);
renderer.setIcon(icon);
}
else {
renderer.setIcon(bookmark.getIcon());