#endif
{
MAIN_CONTROL_FIRST_LEVEL,
- NULL, -1,
+ &menu.main.button.first_level, IMG_MENU_BUTTON_FIRST_LEVEL,
&menu.main.text.first_level, &main_text_first_level,
NULL, NULL,
},
{
MAIN_CONTROL_LAST_LEVEL,
- NULL, -1,
+ &menu.main.button.last_level, IMG_MENU_BUTTON_LAST_LEVEL,
&menu.main.text.last_level, &main_text_last_level,
NULL, NULL,
},
{
MAIN_CONTROL_LEVEL_NUMBER,
- NULL, -1,
+ &menu.main.button.level_number, IMG_MENU_BUTTON_LEVEL_NUMBER,
&menu.main.text.level_number, &main_text_level_number,
NULL, NULL,
},
if (pos_text != NULL) /* (x/y may be -1/-1 here) */
{
- /* calculate size for non-clickable text -- needed for text alignment */
- boolean calculate_text_size = (pos_button == NULL && text != NULL);
+ /* calculate text size -- needed for text alignment */
+ boolean calculate_text_size = (text != NULL);
if (pos_text->width == -1 || calculate_text_size)
pos_text->width = text_width;
FreeScreenGadgets();
CreateScreenGadgets();
+ /* may be required if audio buttons shown on tape and changed in setup menu */
+ FreeGameButtons();
+ CreateGameButtons();
+
/* map gadgets for main menu screen */
MapTapeButtons();
MapScreenMenuGadgets(SCREEN_MASK_MAIN);
{ TYPE_ENTER_LIST, execSetupChooseTransparency, "Button Transparency:" },
{ TYPE_STRING, &transparency_text, "" },
{ TYPE_SWITCH, &setup.touch.draw_outlined, "Draw Buttons Outlined:" },
+ { TYPE_SWITCH, &setup.touch.draw_pressed, "Highlight Pressed Buttons:" },
{ TYPE_EMPTY, NULL, "" },
{ TYPE_ENTER_LIST, execSetupConfigureVirtualButtons, "Configure Virtual Buttons" },
{ TYPE_EMPTY, NULL, "" },
{ TYPE_ENTER_LIST, execSetupChooseTransparency, "Button Transparency:" },
{ TYPE_STRING, &transparency_text, "" },
{ TYPE_SWITCH, &setup.touch.draw_outlined, "Draw Buttons Outlined:" },
+ { TYPE_SWITCH, &setup.touch.draw_pressed, "Highlight Pressed Buttons:" },
{ TYPE_EMPTY, NULL, "" },
{ TYPE_ENTER_LIST, execSetupConfigureVirtualButtons, "Configure Virtual Buttons" },
{ TYPE_EMPTY, NULL, "" },
/* press 'Enter' to keep the existing key binding */
if (key == KSYM_Return ||
+#if defined(TARGET_SDL2)
key == KSYM_Menu ||
+#endif
key == KSYM_space)
{
step_nr++;
}
- else if (key == KSYM_BackSpace ||
- key == KSYM_Back)
+ else if (key == KSYM_BackSpace
+#if defined(TARGET_SDL2)
+ ||
+ key == KSYM_Back
+#endif
+ )
{
if (step_nr == 0)
{
gi = CreateGadget(GDI_CUSTOM_ID, id,
GDI_CUSTOM_TYPE_ID, i,
+ GDI_IMAGE_ID, gfx_unpressed,
GDI_INFO_TEXT, menubutton_info[i].infotext,
GDI_X, x,
GDI_Y, y,
gi = CreateGadget(GDI_CUSTOM_ID, id,
GDI_CUSTOM_TYPE_ID, i,
+ GDI_IMAGE_ID, gfx_unpressed,
GDI_INFO_TEXT, scrollbutton_info[i].infotext,
GDI_X, x,
GDI_Y, y,
gi = CreateGadget(GDI_CUSTOM_ID, id,
GDI_CUSTOM_TYPE_ID, i,
+ GDI_IMAGE_ID, gfx_unpressed,
GDI_INFO_TEXT, scrollbar_info[i].infotext,
GDI_X, x,
GDI_Y, y,