Merge remote-tracking branch 'origin/master'

This commit is contained in:
Egor.Ushakov
2015-02-09 15:02:40 +03:00
15 changed files with 237 additions and 139 deletions
@@ -25,13 +25,9 @@ import com.intellij.debugger.ui.tree.ValueDescriptor;
import com.intellij.debugger.ui.tree.render.CompoundReferenceRenderer;
import com.intellij.debugger.ui.tree.render.DescriptorLabelListener;
import com.intellij.rt.debugger.ImageSerializer;
import com.intellij.ui.Gray;
import com.intellij.ui.JBColor;
import com.intellij.ui.components.JBLabel;
import com.intellij.ui.components.JBScrollPane;
import com.intellij.util.ui.UIUtil;
import com.intellij.xdebugger.frame.XFullValueEvaluator;
import com.sun.jdi.*;
import org.intellij.images.editor.impl.ImageEditorManagerImpl;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -71,24 +67,15 @@ class ImageObjectRenderer extends CompoundReferenceRenderer implements FullValue
}
static JComponent createIconViewer(Icon icon) {
return new JBScrollPane(new JBLabel(icon){
private BufferedImage myBackgroundImage = UIUtil.createImage(16, 16, BufferedImage.TYPE_INT_ARGB);
{
Graphics2D g = myBackgroundImage.createGraphics();
g.setColor(new JBColor(Gray._255, Gray._135));
g.fillRect(0, 0, 17, 17);
g.setColor(new JBColor(Gray._191, Gray._83));
g.fillRect(0, 0, 8, 8);
g.fillRect(8, 8, 8, 8);
}
@Override
public void paint(Graphics g) {
((Graphics2D)g).setPaint(new TexturePaint(myBackgroundImage, new Rectangle(0, 0, 16, 16)));
g.fillRect(0, 0, getWidth()+1, getHeight() + 1);
super.paint(g);
}
});
final int w = icon.getIconWidth();
final int h = icon.getIconHeight();
final BufferedImage image = GraphicsEnvironment.getLocalGraphicsEnvironment()
.getDefaultScreenDevice().getDefaultConfiguration().createCompatibleImage(w, h, Transparency.TRANSLUCENT);
final Graphics2D g = image.createGraphics();
icon.paintIcon(null, g, 0, 0);
g.dispose();
return ImageEditorManagerImpl.createImageEditorUI(image);
}
@Nullable