projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
In editing mode when the user selects a project that was created with older versions...
[bertos.git]
/
bertos
/
gui
/
menu.c
diff --git
a/bertos/gui/menu.c
b/bertos/gui/menu.c
index 6874e3c4b5d4853f1048e83d01825c7cbb3f9fd0..86e8f17dd4453cfc4bd277f48b8c9190c6042454 100644
(file)
--- a/
bertos/gui/menu.c
+++ b/
bertos/gui/menu.c
@@
-42,6
+42,7
@@
#include "menu.h"
#include "cfg/cfg_gfx.h"
#include "menu.h"
#include "cfg/cfg_gfx.h"
+#include "cfg/cfg_arch.h"
#include <cfg/compiler.h>
#include <cfg/debug.h>
#include <cfg/compiler.h>
#include <cfg/debug.h>
@@
-276,6
+277,9
@@
static void menu_layout(
if (!(item->flags & MIF_HIDDEN))
{
/* Check if a special render function is supplied, otherwise use defaults */
if (!(item->flags & MIF_HIDDEN))
{
/* Check if a special render function is supplied, otherwise use defaults */
+ #if (ARCH & ARCH_NIGHTTEST)
+ #warning __FILTER_NEXT_WARNING__
+ #endif
RenderHook renderhook = (item->flags & MIF_RENDERHOOK) ? (RenderHook)item->label : menu_defaultRenderHook;
/* Render menuitem */
RenderHook renderhook = (item->flags & MIF_RENDERHOOK) ? (RenderHook)item->label : menu_defaultRenderHook;
/* Render menuitem */
@@
-291,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 */
@@
-438,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
@@
-538,6
+542,9
@@
iptr_t menu_handle(const struct Menu *menu)
/* Store currently selected item before leaving. */
if (menu->flags & MF_SAVESEL)
/* Store currently selected item before leaving. */
if (menu->flags & MF_SAVESEL)
+ #if (ARCH & ARCH_NIGHTTEST)
+ #warning __FILTER_NEXT_WARNING__
+ #endif
CONST_CAST(struct Menu *, menu)->selected = selected;
return result;
CONST_CAST(struct Menu *, menu)->selected = selected;
return result;