From 17e2a795bbcdbf9bc8eb07e2aaca0a494871b9e8 Mon Sep 17 00:00:00 2001 From: Bert Date: Thu, 27 Jan 2011 16:15:43 +0100 Subject: Added -w cmdline option --- window.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'window.c') diff --git a/window.c b/window.c index e1b8ee7..89340f7 100644 --- a/window.c +++ b/window.c @@ -23,6 +23,7 @@ #include #include "sxiv.h" +#include "options.h" #include "window.h" GC bgc; @@ -53,12 +54,8 @@ void win_open(win_t *win) { win->bgcol = bgcol.pixel; win->pm = 0; - win->w = WIN_WIDTH; - win->h = WIN_HEIGHT; - if (win->w > e->scrw) - win->w = e->scrw; - if (win->h > e->scrh) - win->h = e->scrh; + win->w = MIN(options->winw, e->scrw); + win->h = MIN(options->winh, e->scrh); win->x = (e->scrw - win->w) / 2; win->y = (e->scrh - win->h) / 2; -- cgit v1.2.3