diff options
| author | Simon Howard | 2009-07-13 00:52:26 +0000 |
|---|---|---|
| committer | Simon Howard | 2009-07-13 00:52:26 +0000 |
| commit | 480a31094b7621dd7d65ec05a6e36964dca99b66 (patch) | |
| tree | 11b218d674e828c12981d819b8f2396b680436df /textscreen/txt_scrollpane.c | |
| parent | 37db69b86bc5052901e250578e9c3920886d79ff (diff) | |
| parent | e66653a8a67f3613344ae4ea30b37403d6ff17cf (diff) | |
| download | chocolate-doom-480a31094b7621dd7d65ec05a6e36964dca99b66.tar.gz chocolate-doom-480a31094b7621dd7d65ec05a6e36964dca99b66.tar.bz2 chocolate-doom-480a31094b7621dd7d65ec05a6e36964dca99b66.zip | |
Merge from trunk.
Subversion-branch: /branches/opl-branch
Subversion-revision: 1624
Diffstat (limited to 'textscreen/txt_scrollpane.c')
| -rw-r--r-- | textscreen/txt_scrollpane.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/textscreen/txt_scrollpane.c b/textscreen/txt_scrollpane.c index e9989f19..ef6e4fb3 100644 --- a/textscreen/txt_scrollpane.c +++ b/textscreen/txt_scrollpane.c @@ -233,8 +233,8 @@ static void ShowSelectedWidget(txt_scrollpane_t *scrollpane) { scrollpane->y -= scrollpane->widget.y - selected->y; } - else if (selected->y + selected->h > - scrollpane->widget.y + scrollpane->h) + else if ((signed) (selected->y + selected->h) > + (signed) (scrollpane->widget.y + scrollpane->h)) { scrollpane->y += (selected->y + selected->h) - (scrollpane->widget.y + scrollpane->h); @@ -246,8 +246,8 @@ static void ShowSelectedWidget(txt_scrollpane_t *scrollpane) { scrollpane->x -= scrollpane->widget.x - selected->x; } - else if (selected->x + selected->w > - scrollpane->widget.x + scrollpane->w) + else if ((signed) (selected->x + selected->w) > + (signed) (scrollpane->widget.x + scrollpane->w)) { scrollpane->x += (selected->x + selected->w) - (scrollpane->widget.x + scrollpane->w); |