From 866aa789a8fed3cf49e5afe271c9a020966e2cef Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Thu, 21 Apr 2016 16:15:25 +0300
Subject: [PATCH] cleanup

---
 .../core-api/src/com/intellij/ui/LayeredIcon.java  | 14 --------------
 .../bookmarks/BookmarksFavoriteListProvider.java   |  9 +++++++--
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/platform/core-api/src/com/intellij/ui/LayeredIcon.java b/platform/core-api/src/com/intellij/ui/LayeredIcon.java
index df956ccd7d2f..23570577bbd0 100644
--- a/platform/core-api/src/com/intellij/ui/LayeredIcon.java
+++ b/platform/core-api/src/com/intellij/ui/LayeredIcon.java
@@ -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;
diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/BookmarksFavoriteListProvider.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/BookmarksFavoriteListProvider.java
index 48d542782ab9..f7b0a74144b3 100644
--- a/platform/lang-impl/src/com/intellij/ide/bookmarks/BookmarksFavoriteListProvider.java
+++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/BookmarksFavoriteListProvider.java
@@ -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());