X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fgadgets.c;h=3ac1f9d55fdc5c100d29409e7fd244f367e66f94;hb=c4621f6e17b3806b7edc0ab50e72353cb991842e;hp=1004199f40d45bdd9cf405ca4398a71f1e75d045;hpb=f73405762b7a66ebed17c0f6fa56e909d7e5626f;p=rocksndiamonds.git diff --git a/src/libgame/gadgets.c b/src/libgame/gadgets.c index 1004199f..3ac1f9d5 100644 --- a/src/libgame/gadgets.c +++ b/src/libgame/gadgets.c @@ -4,7 +4,7 @@ // (c) 1995-2014 by Artsoft Entertainment // Holger Schemel // info@artsoft.org -// http://www.artsoft.org/ +// https://www.artsoft.org/ // ---------------------------------------------------------------------------- // gadgets.c // ============================================================================ @@ -808,7 +808,8 @@ static void DrawGadget_OverlayTouchButton(struct GadgetInfo *gi) int alpha_max = SDL_ALPHA_OPAQUE; int alpha_step = ALPHA_FADING_STEPSIZE(alpha_max); - if (gi->mapped) + // only show mapped overlay touch buttons if touch screen is really used + if (gi->mapped && runtime.uses_touch_device) { if (alpha < alpha_max) alpha = MIN(alpha + alpha_step, alpha_max); @@ -883,7 +884,7 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap) while (tag != GDI_END) { - switch(tag) + switch (tag) { case GDI_IMAGE_ID: gi->image_id = va_arg(ap, int); @@ -1478,6 +1479,10 @@ static void MapGadgetExt(struct GadgetInfo *gi, boolean redraw) if (gi == NULL || gi->deactivated || gi->mapped) return; + // do not map overlay touch buttons if touch screen is not used + if (gi->overlay_touch_button && !runtime.uses_touch_device) + return; + gi->mapped = TRUE; if (redraw)