aboutsummaryrefslogtreecommitdiffstats
path: root/widgets
diff options
context:
space:
mode:
authorChristopher James Lahey <clahey@helixcode.com>2000-06-21 15:18:28 +0800
committerChris Lahey <clahey@src.gnome.org>2000-06-21 15:18:28 +0800
commit06f77b4aab08dfb27c497556ed340f7883060071 (patch)
treeacc388a6cbfd905964bb028c6559ec68f1d3cf1e /widgets
parent3eed16a6cd5c50cd21e558a677cd329443b1a4b7 (diff)
downloadgsoc2013-evolution-06f77b4aab08dfb27c497556ed340f7883060071.tar
gsoc2013-evolution-06f77b4aab08dfb27c497556ed340f7883060071.tar.gz
gsoc2013-evolution-06f77b4aab08dfb27c497556ed340f7883060071.tar.bz2
gsoc2013-evolution-06f77b4aab08dfb27c497556ed340f7883060071.tar.lz
gsoc2013-evolution-06f77b4aab08dfb27c497556ed340f7883060071.tar.xz
gsoc2013-evolution-06f77b4aab08dfb27c497556ed340f7883060071.tar.zst
gsoc2013-evolution-06f77b4aab08dfb27c497556ed340f7883060071.zip
Fixed some vertical scroll bugs.
2000-06-21 Christopher James Lahey <clahey@helixcode.com> * widgets/e-text/e-text.c: Fixed some vertical scroll bugs. svn path=/trunk/; revision=3673
Diffstat (limited to 'widgets')
-rw-r--r--widgets/e-text/e-text.c16
-rw-r--r--widgets/text/e-text.c16
2 files changed, 16 insertions, 16 deletions
diff --git a/widgets/e-text/e-text.c b/widgets/e-text/e-text.c
index 614c87af97..6b371e0ba3 100644
--- a/widgets/e-text/e-text.c
+++ b/widgets/e-text/e-text.c
@@ -1388,11 +1388,11 @@ e_text_reflow (GnomeCanvasItem *item, int flags)
text->xofs_edit = 2 + x - text->clip_width;
}
- if ((text->font->ascent + text->font->descent) * (i - 1) < text->yofs_edit)
- text->yofs_edit = (text->font->ascent + text->font->descent) * (i - 1);
+ if ((text->font->ascent + text->font->descent) * i < text->yofs_edit)
+ text->yofs_edit = (text->font->ascent + text->font->descent) * i;
- if (2 + (text->font->ascent + text->font->descent) * i - text->clip_height > text->yofs_edit)
- text->yofs_edit = 2 + (text->font->ascent + text->font->descent) * i - text->clip_height;
+ if ((text->font->ascent + text->font->descent) * (i + 1) - (text->clip_height != -1 ? text->clip_height : text->height) > text->yofs_edit)
+ text->yofs_edit = (text->font->ascent + text->font->descent) * (i + 1) - (text->clip_height != -1 ? text->clip_height : text->height);
}
if ( text->needs_calc_height ) {
calc_height (text);
@@ -2871,11 +2871,11 @@ e_text_command(ETextEventProcessor *tep, ETextEventProcessorCommand *command, gp
text->xofs_edit = 2 + x - text->clip_width;
}
- if ((text->font->ascent + text->font->descent) * (i - 1) < text->yofs_edit)
- text->yofs_edit = (text->font->ascent + text->font->descent) * (i - 1);
+ if ((text->font->ascent + text->font->descent) * i < text->yofs_edit)
+ text->yofs_edit = (text->font->ascent + text->font->descent) * i;
- if (2 + (text->font->ascent + text->font->descent) * i - text->clip_height > text->yofs_edit)
- text->yofs_edit = 2 + (text->font->ascent + text->font->descent) * i - text->clip_height;
+ if ((text->font->ascent + text->font->descent) * (i + 1) - (text->clip_height != -1 ? text->clip_height : text->height) > text->yofs_edit)
+ text->yofs_edit = (text->font->ascent + text->font->descent) * (i + 1) - (text->clip_height != -1 ? text->clip_height : text->height);
}
text->needs_redraw = 1;
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index 614c87af97..6b371e0ba3 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -1388,11 +1388,11 @@ e_text_reflow (GnomeCanvasItem *item, int flags)
text->xofs_edit = 2 + x - text->clip_width;
}
- if ((text->font->ascent + text->font->descent) * (i - 1) < text->yofs_edit)
- text->yofs_edit = (text->font->ascent + text->font->descent) * (i - 1);
+ if ((text->font->ascent + text->font->descent) * i < text->yofs_edit)
+ text->yofs_edit = (text->font->ascent + text->font->descent) * i;
- if (2 + (text->font->ascent + text->font->descent) * i - text->clip_height > text->yofs_edit)
- text->yofs_edit = 2 + (text->font->ascent + text->font->descent) * i - text->clip_height;
+ if ((text->font->ascent + text->font->descent) * (i + 1) - (text->clip_height != -1 ? text->clip_height : text->height) > text->yofs_edit)
+ text->yofs_edit = (text->font->ascent + text->font->descent) * (i + 1) - (text->clip_height != -1 ? text->clip_height : text->height);
}
if ( text->needs_calc_height ) {
calc_height (text);
@@ -2871,11 +2871,11 @@ e_text_command(ETextEventProcessor *tep, ETextEventProcessorCommand *command, gp
text->xofs_edit = 2 + x - text->clip_width;
}
- if ((text->font->ascent + text->font->descent) * (i - 1) < text->yofs_edit)
- text->yofs_edit = (text->font->ascent + text->font->descent) * (i - 1);
+ if ((text->font->ascent + text->font->descent) * i < text->yofs_edit)
+ text->yofs_edit = (text->font->ascent + text->font->descent) * i;
- if (2 + (text->font->ascent + text->font->descent) * i - text->clip_height > text->yofs_edit)
- text->yofs_edit = 2 + (text->font->ascent + text->font->descent) * i - text->clip_height;
+ if ((text->font->ascent + text->font->descent) * (i + 1) - (text->clip_height != -1 ? text->clip_height : text->height) > text->yofs_edit)
+ text->yofs_edit = (text->font->ascent + text->font->descent) * (i + 1) - (text->clip_height != -1 ? text->clip_height : text->height);
}
text->needs_redraw = 1;