projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lm3s1968: merge the DevelGPS example application.
[bertos.git]
/
bertos
/
gui
/
menu.c
diff --git
a/bertos/gui/menu.c
b/bertos/gui/menu.c
index e689ff96cd96ef8362768ab4d5e20eb1dd434d3b..86e8f17dd4453cfc4bd277f48b8c9190c6042454 100644
(file)
--- a/
bertos/gui/menu.c
+++ b/
bertos/gui/menu.c
@@
-280,7
+280,7
@@
static void menu_layout(
#if (ARCH & ARCH_NIGHTTEST)
#warning __FILTER_NEXT_WARNING__
#endif
#if (ARCH & ARCH_NIGHTTEST)
#warning __FILTER_NEXT_WARNING__
#endif
- RenderHook renderhook = (item->flags & MIF_RENDERHOOK) ?
CONST_CAST(RenderHook, item->label)
: menu_defaultRenderHook;
+ RenderHook renderhook = (item->flags & MIF_RENDERHOOK) ?
(RenderHook)item->label
: menu_defaultRenderHook;
/* Render menuitem */
renderhook(menu->bitmap, ypos++, (i == selected), item);
/* Render menuitem */
renderhook(menu->bitmap, ypos++, (i == selected), item);
@@
-295,7
+295,7
@@
static void menu_layout(
/* Clear rest of area */
gfx_rectClear(bm, bm->cr.xmin, ypos, bm->cr.xmax, bm->cr.ymax);
/* Clear rest of area */
gfx_rectClear(bm, bm->cr.xmin, ypos, bm->cr.xmax, bm->cr.ymax);
- lcd_blitBitmap(
&lcd_bitmap
);
+ lcd_blitBitmap(
bm
);
}
/* Restore old cliprect */
}
/* Restore old cliprect */
@@
-442,7
+442,7
@@
iptr_t menu_handle(const struct Menu *menu)
items_per_page =
items_per_page =
- (menu->bitmap->height / menu->bitmap->font->height)
+ (menu->bitmap->height / menu->bitmap->font->height
- 1
)
#if CONFIG_MENU_MENUBAR
- 1 /* menu bar labels */
#endif
#if CONFIG_MENU_MENUBAR
- 1 /* menu bar labels */
#endif