This change adds a new option for the "graphicsinfo.conf" file for
defining a "passthrough" option for global animations that causes
clicks on clickable global animations not to be consumed, but to
be passed-through to the underlying screen controls (or other global
animations under the clicked global animation). The new option works
like this:
global.anim_1.part_1.MAIN.anim_event: click
global.anim_1.part_1.MAIN.style: passthrough_clicks
The second option is the new one (the first one already existed).
When clicking this global animation (on the main menu screen), the
click will passed-through to the main menu screen to be further
processed by screen controls like gadgets or menu buttons.
+static boolean setPartClicked(struct GlobalAnimPartControlInfo *part)
+{
+ part->clicked = TRUE;
+
+ return (part->control_info.style & STYLE_PASSTHROUGH ? FALSE : TRUE);
+}
+
int HandleGlobalAnim_Part(struct GlobalAnimPartControlInfo *part, int state)
{
struct GlobalAnimControlInfo *ctrl = &global_anim_ctrl[part->mode_nr];
int HandleGlobalAnim_Part(struct GlobalAnimPartControlInfo *part, int state)
{
struct GlobalAnimControlInfo *ctrl = &global_anim_ctrl[part->mode_nr];
// always handle "any" click events (clicking anywhere on screen) ...
if (isClickablePart(part, ANIM_EVENT_ANY))
// always handle "any" click events (clicking anywhere on screen) ...
if (isClickablePart(part, ANIM_EVENT_ANY))
- anything_clicked = part->clicked = TRUE;
+ anything_clicked = setPartClicked(part);
// ... but only handle the first (topmost) clickable animation
if (any_part_clicked)
// ... but only handle the first (topmost) clickable animation
if (any_part_clicked)
any_part_clicked = TRUE;
if (isClickablePart(part, ANIM_EVENT_SELF))
any_part_clicked = TRUE;
if (isClickablePart(part, ANIM_EVENT_SELF))
- anything_clicked = part->clicked = TRUE;
+ anything_clicked = setPartClicked(part);
// check if this click is defined to trigger other animations
int gic_anim_nr = part->old_anim_nr + 1; // X as in "anim_X"
// check if this click is defined to trigger other animations
int gic_anim_nr = part->old_anim_nr + 1; // X as in "anim_X"
if (isClickablePart(part2, mask))
{
if (isClickablePart(part2, mask))
{
- anything_clicked = part2->clicked = TRUE;
#if 0
printf("::: %d.%d TRIGGER CLICKED [%d]\n", anim2_nr, part2_nr,
#if 0
printf("::: %d.%d TRIGGER CLICKED [%d]\n", anim2_nr, part2_nr,
if (string_has_parameter(value, "reverse"))
result |= STYLE_REVERSE;
if (string_has_parameter(value, "reverse"))
result |= STYLE_REVERSE;
+
+ if (string_has_parameter(value, "passthrough_clicks"))
+ result |= STYLE_PASSTHROUGH;
}
else if (strEqual(suffix, ".fade_mode"))
{
}
else if (strEqual(suffix, ".fade_mode"))
{
#define STYLE_INNER_CORNERS (1 << 1)
#define STYLE_REVERSE (1 << 2)
#define STYLE_INNER_CORNERS (1 << 1)
#define STYLE_REVERSE (1 << 2)
+/* values for special event handling style (used for global animation) */
+#define STYLE_PASSTHROUGH (1 << 3)
+
#define STYLE_DEFAULT STYLE_NONE
/* values for special global animation events */
#define STYLE_DEFAULT STYLE_NONE
/* values for special global animation events */