projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20030629-2-src
[rocksndiamonds.git]
/
src
/
libgame
/
gadgets.c
diff --git
a/src/libgame/gadgets.c
b/src/libgame/gadgets.c
index 7b92820009b1138c5d1f8a2dd40a414bdf6e46a1..b80910d8822ec7ae12fc2503fe5b6355c8720f85 100644
(file)
--- a/
src/libgame/gadgets.c
+++ b/
src/libgame/gadgets.c
@@
-828,6
+828,7
@@
static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
int border_xsize = gi->border.xsize;
int border_ysize = gi->border.ysize;
int button_size = gi->border.xsize_selectbutton;
int border_xsize = gi->border.xsize;
int border_ysize = gi->border.ysize;
int button_size = gi->border.xsize_selectbutton;
+ int bottom_screen_border = gfx.sy + gfx.sysize - font_height;
Bitmap *src_bitmap;
int src_x, src_y;
Bitmap *src_bitmap;
int src_x, src_y;
@@
-848,10
+849,10
@@
static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
gi->selectbox.x = gi->x;
gi->selectbox.y = gi->y + gi->height;
gi->selectbox.x = gi->x;
gi->selectbox.y = gi->y + gi->height;
- if (gi->selectbox.y + gi->selectbox.height >
gfx.real_sy + gfx.full_sysize
)
+ if (gi->selectbox.y + gi->selectbox.height >
bottom_screen_border
)
gi->selectbox.y = gi->y - gi->selectbox.height;
if (gi->selectbox.y < 0)
gi->selectbox.y = gi->y - gi->selectbox.height;
if (gi->selectbox.y < 0)
- gi->selectbox.y =
gfx.real_sy + gfx.full_sysize
- gi->selectbox.height;
+ gi->selectbox.y =
bottom_screen_border
- gi->selectbox.height;
getFontCharSource(font_nr, FONT_ASCII_CURSOR, &src_bitmap, &src_x, &src_y);
src_x += font_width / 2;
getFontCharSource(font_nr, FONT_ASCII_CURSOR, &src_bitmap, &src_x, &src_y);
src_x += font_width / 2;