mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-15 04:54:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jq/bugfix-img-xyoff-scrolling' of https://github.com/jquast/kitty

Browse Source
This commit is contained in:
Kovid Goyal
2026-07-13 08:42:24 +05:30
parent 0bf176be5c efeb4aead0
commit 2b7ac118fb
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kitty/graphics.c
View File

@@ -830,8 +830,9 @@ update_src_rect(ImageRef *ref, Image *img) {
static void
update_dest_rect(ImageRef *ref, uint32_t num_cols, uint32_t num_rows, CellPixelSize cell) {
uint32_t t;
if (num_cols == 0) {
if (num_rows == 0) {
const bool auto_cols = num_cols == 0, auto_rows = num_rows == 0;
if (auto_cols) {
if (auto_rows) {
t = (uint32_t)(ref->src_width + ref->cell_x_offset);
num_cols = t / cell.width;
if (t > num_cols * cell.width) num_cols += 1;
@@ -841,8 +842,8 @@ update_dest_rect(ImageRef *ref, uint32_t num_cols, uint32_t num_rows, CellPixelS
num_cols = (uint32_t)ceil(width_px / cell.width);
}
}
if (num_rows == 0) {
if (num_cols == 0) {
if (auto_rows) {
if (auto_cols) {
t = (uint32_t)(ref->src_height + ref->cell_y_offset);
num_rows = t / cell.height;
if (t > num_rows * cell.height) num_rows += 1;

7
kitty_tests/graphics.py
View File

@@ -647,6 +647,13 @@ class TestGraphics(BaseTest):
self.ae((s.cursor.x, s.cursor.y), (3, 2))
rect_eq(layers(s)[0]['dest_rect'], -1, 1, -1 + 3 * dx, 1 - 3*dy)
def test_graphics_put_with_pixel_offsets(self):
cw, ch = 10, 20
# Image 10x20 placed with 5px X and Y pixel offsets
s, dx, dy, put_image, put_ref, layers, rect_eq = put_helpers(self, cw, ch)
self.ae(put_image(s, 10, 20, cell_x_off=5, cell_y_off=5)[1], 'OK')
self.ae((s.cursor.x, s.cursor.y), (2, 1))
def test_image_layer_grouping(self):
cw, ch = 10, 20
s, dx, dy, put_image, put_ref, layers, rect_eq = put_helpers(self, cw, ch)