Merge pull request #270 from yoichi/fix-layout-with-sixel

Fix layout with sixel image backend

Author: o2sh

src/onefetch/image_backends/sixel.rs

@@ -77,8 +77,10 @@ impl super::ImageBackend for SixelBackend {
             ioctl(STDOUT_FILENO, TIOCGWINSZ, &tty_size);
             tty_size
         };
-        let width_ratio = tty_size.ws_col as f64 / tty_size.ws_xpixel as f64;
-        let height_ratio = tty_size.ws_row as f64 / tty_size.ws_ypixel as f64;
+        let cw = tty_size.ws_xpixel / tty_size.ws_col;
+        let lh = tty_size.ws_ypixel / tty_size.ws_row;
+        let width_ratio = 1.0 / cw as f64;
+        let height_ratio = 1.0 / lh as f64;
 
         // resize image to fit the text height with the Lanczos3 algorithm
         let image = image.resize(
@@ -152,7 +154,7 @@ impl super::ImageBackend for SixelBackend {
         }
         image_data.extend(b"\x1B\\");
 
-        image_data.extend(format!("\x1B[{}A", image_rows as u32 + 2).as_bytes()); // move cursor to top-left corner
+        image_data.extend(format!("\x1B[{}A", image_rows as u32).as_bytes()); // move cursor to top-left corner
         image_data.extend(format!("\x1B[{}C", image_columns as u32 + 1).as_bytes()); // move cursor to top-right corner of image
         let mut i = 0;
         for line in &lines {