Merge branch 'subtree'

[fanfix.git] / src / jexer / TImage.java

diff --git a/src/jexer/TImage.java b/src/jexer/TImage.java
index 1463f1008f4788fa0d0e056565bc0565c5cfe505..b7bfbd00a2ff165becc701575023b42e50b6deed 100644 (file)
--- a/src/jexer/TImage.java
+++ b/src/jexer/TImage.java
@@ -30,9 +30,6 @@ package jexer;
 
 import java.awt.image.BufferedImage;
 
-import jexer.backend.ECMA48Terminal;
-import jexer.backend.MultiScreen;
-import jexer.backend.SwingTerminal;
 import jexer.bits.Cell;
 import jexer.event.TCommandEvent;
 import jexer.event.TKeypressEvent;
@@ -425,8 +422,21 @@ public class TImage extends TWidget implements EditMenuUser {
                     }
 
                     Cell cell = new Cell();
-                    cell.setImage(image.getSubimage(x * textWidth,
-                            y * textHeight, width, height));
+                    if ((width != textWidth) || (height != textHeight)) {
+                        BufferedImage newImage;
+                        newImage = new BufferedImage(textWidth, textHeight,
+                            BufferedImage.TYPE_INT_ARGB);
+
+                        java.awt.Graphics gr = newImage.getGraphics();
+                        gr.drawImage(image.getSubimage(x * textWidth,
+                                y * textHeight, width, height),
+                            0, 0, null, null);
+                        gr.dispose();
+                        cell.setImage(newImage);
+                    } else {
+                        cell.setImage(image.getSubimage(x * textWidth,
+                                y * textHeight, width, height));
+                    }
 
                     cells[x][y] = cell;
                 }