summaryrefslogtreecommitdiff
path: root/src/xsane-viewer.c
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@mapreri.org>2014-10-03 14:05:45 +0000
committerMattia Rizzolo <mattia@mapreri.org>2014-10-03 14:05:45 +0000
commitdc7150ada6000f0c8e6ee61da9598573d3b63b7f (patch)
treed202e9601485fce914f1f692f6356c4fd961ee81 /src/xsane-viewer.c
parent41b1173190f702693b0b4fd2654cf2dc28a447f4 (diff)
Imported Upstream version 0.996upstream/0.996
Diffstat (limited to 'src/xsane-viewer.c')
-rw-r--r--src/xsane-viewer.c16
1 files changed, 8 insertions, 8 deletions
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