sixel support for TTerminalWindow

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

diff --git a/src/jexer/TImageWindow.java b/src/jexer/TImageWindow.java
index a4a54a91d8c601ebd82c0311ddba7f2056ac9d8c..057f6ac18f9cd707fcad9b2d2ed4d340d0bb64f3 100644 (file)
--- a/src/jexer/TImageWindow.java
+++ b/src/jexer/TImageWindow.java
@@ -104,8 +104,8 @@ public class TImageWindow extends TScrollableWindow {
 
         BufferedImage image = ImageIO.read(file);
 
-        imageField = new TImage(this, 0, 0, getWidth() - 2, getHeight() - 2,
-            image, 0, 0, null);
+        imageField = addImage(0, 0, getWidth() - 2, getHeight() - 2,
+            image, 0, 0);
         setTitle(file.getName());
 
         setupAfterImage();
@@ -124,7 +124,10 @@ public class TImageWindow extends TScrollableWindow {
             setWidth(imageField.getColumns() + 2);
         }
 
-        hScroller = new THScroller(this, 17, getHeight() - 2, getWidth() - 20);
+        hScroller = new THScroller(this,
+            Math.min(Math.max(0, getWidth() - 17), 17),
+            getHeight() - 2,
+            getWidth() - Math.min(Math.max(0, getWidth() - 17), 17) - 3);
         vScroller = new TVScroller(this, getWidth() - 2, 0, getHeight() - 2);
         setTopValue(0);
         setBottomValue(imageField.getRows() - imageField.getHeight());