Merge branch 'subtree'

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

diff --git a/src/jexer/TImageWindow.java b/src/jexer/TImageWindow.java
index 86b0d6d62811d201b902646fe2fcd5d6ab16133d..15db1da3dd4f61fa3e387c314bc4291e38a8ec47 100644 (file)
--- a/src/jexer/TImageWindow.java
+++ b/src/jexer/TImageWindow.java
@@ -82,7 +82,7 @@ public class TImageWindow extends TScrollableWindow {
         final File file) throws IOException {
 
         this(parent, file, 0, 0, parent.getScreen().getWidth(),
-            parent.getScreen().getHeight() - 2);
+            parent.getDesktopBottom() - parent.getDesktopTop());
     }
 
     /**
@@ -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());