diff options
author | neonloop | 2021-08-04 15:18:40 +0000 |
---|---|---|
committer | neonloop | 2021-08-04 15:18:40 +0000 |
commit | 0addef625ae5525bc32c3e998ad2d21c1ff892c3 (patch) | |
tree | 8195acc73b95b4e1dcfac2cee42d40cb1b448028 | |
parent | 99632f66e74fc57c463072be312d634aeb67bc61 (diff) | |
download | picoarch-0addef625ae5525bc32c3e998ad2d21c1ff892c3.tar.gz picoarch-0addef625ae5525bc32c3e998ad2d21c1ff892c3.tar.bz2 picoarch-0addef625ae5525bc32c3e998ad2d21c1ff892c3.zip |
Switches to aspect scaling if the screen is too small for no scaling
-rw-r--r-- | scale.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -835,7 +835,8 @@ static void scale_select_scaler(unsigned w, unsigned h, size_t pitch) { dst_w = SCREEN_WIDTH; dst_h = SCREEN_HEIGHT; dst_offs = 0; - } else if (scale_size == SCALE_SIZE_ASPECT) { + } else if (scale_size == SCALE_SIZE_ASPECT || + (scale_size == SCALE_SIZE_NONE && w > SCREEN_WIDTH || h > SCREEN_HEIGHT)) { dst_w = SCREEN_WIDTH; dst_h = SCREEN_WIDTH / aspect_ratio + 0.5; dst_offs = ((SCREEN_HEIGHT-dst_h)/2) * SCREEN_PITCH; @@ -845,7 +846,7 @@ static void scale_select_scaler(unsigned w, unsigned h, size_t pitch) { dst_h = SCREEN_HEIGHT; dst_offs = ((SCREEN_WIDTH-dst_w)/2); } - } else if (scale_size == SCALE_SIZE_NONE && w <= SCREEN_WIDTH && h <= SCREEN_HEIGHT) { + } else if (scale_size == SCALE_SIZE_NONE) { unsigned dst_x = ((SCREEN_WIDTH - w) * SCREEN_BPP / 2); unsigned dst_y = ((SCREEN_HEIGHT - h) / 2); dst_offs = dst_y * SCREEN_PITCH + dst_x; |