commit 1882cb673394303e858642d3f688108400950a6c
parent 51c367dfdc19409e2c09466b839cee08e4670d46
Author: Drew DeVault <sir@cmpwn.com>
Date: Tue, 27 Dec 2016 17:23:45 -0700
Merge pull request #1017 from zandrmartin/swaylock-scaling-mode
fix #971
Diffstat:
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/swaylock/main.c b/swaylock/main.c
@@ -236,7 +236,7 @@ void render_image(struct window *window, cairo_surface_t *image, enum scaling_mo
case SCALING_MODE_FILL:
{
double window_ratio = (double) wwidth / wheight;
- double bg_ratio = wheight;
+ double bg_ratio = width / height;
if (window_ratio > bg_ratio) {
double scale = (double) wwidth / width;
@@ -348,7 +348,7 @@ int main(int argc, char **argv) {
" -v, --version Show the version number and quit.\n"
" -i, --image [<output>:]<path> Display the given image.\n"
" -u, --no-unlock-indicator Disable the unlock indicator.\n"
- " -f, --daemonize Detach from the controlling terminal.\n"
+ " -f, --daemonize Detach from the controlling terminal.\n"
" --socket <socket> Use the specified socket.\n";