From dc7150ada6000f0c8e6ee61da9598573d3b63b7f Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo Date: Fri, 3 Oct 2014 14:05:45 +0000 Subject: Imported Upstream version 0.996 --- src/xsane-viewer.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/xsane-viewer.c') diff --git a/src/xsane-viewer.c b/src/xsane-viewer.c index 57abd98..3ca14f6 100644 --- a/src/xsane-viewer.c +++ b/src/xsane-viewer.c @@ -2536,14 +2536,14 @@ static int xsane_viewer_read_image(Viewer *v) width = image_info.image_width * v->zoom + 26; height = image_info.image_height * v->zoom + 136; - if (width > gdk_screen_width()) + if (width >= gdk_screen_width()) { - width = gdk_screen_width(); + width = gdk_screen_width()-1; } - if (height > gdk_screen_height()) + if (height >= gdk_screen_height()) { - height = gdk_screen_height(); + height = gdk_screen_height()-1; } #ifdef HAVE_GTK2 @@ -2756,14 +2756,14 @@ static int xsane_viewer_read_image(Viewer *v) width = image_info.image_width * v->zoom + 26; height = image_info.image_height * v->zoom + 136; - if (width > gdk_screen_width()) + if (width >= gdk_screen_width()) { - width = gdk_screen_width(); + width = gdk_screen_width()-1; } - if (height > gdk_screen_height()) + if (height >= gdk_screen_height()) { - height = gdk_screen_height(); + height = gdk_screen_height()-1; } #ifdef HAVE_GTK2 -- cgit v1.2.3