Merge origin/4902-image-support into 4902-image-support

Keep the global SIXEL cache and retention removal while incorporating the Escape-termination revert. Remove the manual-size comment in resize.c.
This commit is contained in:
Nicholas Marriott
2026-10-14 15:43:21 +01:00
3 changed files with 2 additions and 39 deletions

View File

@@ -153,10 +153,6 @@ clients_calculate_size(int type, int current, struct client *c,
*sy = UINT_MAX;
}
if (w != NULL && type == WINDOW_SIZE_MANUAL) {
/*
* Keep the window's pixel size in manual mode to avoid scheduling
* a resize on every recalculation.
*/
*xpixel = w->xpixel;
*ypixel = w->ypixel;
} else {