gi->y > gfx.vy ? REDRAW_DOOR_2 : REDRAW_DOOR_3);
}
+static int get_minimal_size_for_numeric_input(int minmax_value)
+{
+ int min_size = 1; /* value needs at least one digit */
+ int i;
+
+ /* add number of digits needed for absolute value */
+ for (i = 10; i <= ABS(minmax_value); i *= 10)
+ min_size++;
+
+ /* if min/max value is negative, add one digit for minus sign */
+ if (minmax_value < 0)
+ min_size++;
+
+ return min_size;
+}
+
static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
{
int tag = first_tag;
case GDI_NUMBER_VALUE:
gi->textinput.number_value = va_arg(ap, long);
sprintf(gi->textinput.value, "%d", gi->textinput.number_value);
+ strcpy(gi->textinput.last_value, gi->textinput.value);
gi->textinput.cursor_position = strlen(gi->textinput.value);
break;
{
gi->textinput.number_value = gi->textinput.number_min;
sprintf(gi->textinput.value, "%d", gi->textinput.number_value);
+ strcpy(gi->textinput.last_value, gi->textinput.value);
}
break;
{
gi->textinput.number_value = gi->textinput.number_max;
sprintf(gi->textinput.value, "%d", gi->textinput.number_value);
+ strcpy(gi->textinput.last_value, gi->textinput.value);
}
break;
max_textsize = MIN(gi->textinput.size, MAX_GADGET_TEXTSIZE - 1);
strncpy(gi->textinput.value, va_arg(ap, char *), max_textsize);
+ strcpy(gi->textinput.last_value, gi->textinput.value);
+
gi->textinput.value[max_textsize] = '\0';
gi->textinput.cursor_position = strlen(gi->textinput.value);
/* same tag also used for other gadget definitions */
strcpy(gi->textbutton.value, gi->textinput.value);
strcpy(gi->textarea.value, gi->textinput.value);
+ strcpy(gi->textarea.last_value, gi->textinput.value);
}
break;
gi->textinput.size = max_textsize;
gi->textinput.value[max_textsize] = '\0';
+ strcpy(gi->textinput.last_value, gi->textinput.value);
/* same tag also used for other gadget definitions */
- strcpy(gi->textbutton.value, gi->textinput.value);
- gi->textbutton.size = gi->textinput.size;
+
+ gi->textarea.size = max_textsize;
+ gi->textarea.value[max_textsize] = '\0';
+ strcpy(gi->textarea.last_value, gi->textinput.value);
+
+ gi->textbutton.size = max_textsize;
+ gi->textbutton.value[max_textsize] = '\0';
+
gi->selectbox.size = gi->textinput.size;
}
break;
int border_xsize = gi->border.xsize;
int border_ysize = gi->border.ysize;
+ if (gi->type == GD_TYPE_TEXT_INPUT_NUMERIC)
+ {
+ int number_min = gi->textinput.number_min;
+ int number_max = gi->textinput.number_max;
+ int min_size_min = get_minimal_size_for_numeric_input(number_min);
+ int min_size_max = get_minimal_size_for_numeric_input(number_max);
+ int min_size = MAX(min_size_min, min_size_max);
+
+ /* expand gadget text input size, if maximal value is too large */
+ if (gi->textinput.size < min_size)
+ gi->textinput.size = min_size;
+ }
+
gi->width = 2 * border_xsize + (gi->textinput.size + 1) * font_width;
gi->height = 2 * border_ysize + font_height;
}
if (gi->type & GD_TYPE_SCROLLBAR)
{
struct GadgetScrollbar *gs = &gi->scrollbar;
+ int scrollbar_size_cmp;
if (gi->width == 0 || gi->height == 0 ||
gs->items_max == 0 || gs->items_visible == 0)
Error(ERR_EXIT, "scrollbar gadget incomplete (missing tags)");
/* calculate internal scrollbar values */
+ gs->size_min = (gi->type == GD_TYPE_SCROLLBAR_VERTICAL ?
+ gi->width : gi->height);
gs->size_max = (gi->type == GD_TYPE_SCROLLBAR_VERTICAL ?
gi->height : gi->width);
- gs->size = gs->size_max * gs->items_visible / gs->items_max;
- gs->position = gs->size_max * gs->item_position / gs->items_max;
+
+ scrollbar_size_cmp = gs->size_max * gs->items_visible / gs->items_max;
+ gs->size = MAX(scrollbar_size_cmp, gs->size_min);
+ gs->size_max_cmp = (gs->size_max - (gs->size - scrollbar_size_cmp));
+
+ gs->position = gs->size_max_cmp * gs->item_position / gs->items_max;
gs->position_max = gs->size_max - gs->size;
gs->correction = gs->size_max / gs->items_max / 2;
void ClickOnGadget(struct GadgetInfo *gi, int button)
{
+ if (!gi->mapped)
+ return;
+
/* simulate releasing mouse button over last gadget, if still pressed */
if (button_status)
HandleGadgets(-1, -1, 0);
button != 0 && !motion_status && new_gi != last_gi)
#endif
{
- CheckRangeOfNumericInputGadget(last_gi); /* in case of numeric gadget */
+ struct GadgetInfo *gi = last_gi;
+ boolean gadget_changed = (gi->event_mask & GD_EVENT_TEXT_LEAVING);
+
+ /* check if text gadget has changed its value */
+ if (gi->type & GD_TYPE_TEXT_INPUT)
+ {
+ CheckRangeOfNumericInputGadget(gi);
- DrawGadget(last_gi, DG_UNPRESSED, last_gi->direct_draw);
+ if (strcmp(gi->textinput.value, gi->textinput.last_value) != 0)
+ strcpy(gi->textinput.last_value, gi->textinput.value);
+ else
+ gadget_changed = FALSE;
+ }
- last_gi->event.type = GD_EVENT_TEXT_LEAVING;
+ /* selectbox does not change its value when closed by clicking outside */
+ if (gi->type & GD_TYPE_SELECTBOX)
+ gadget_changed = FALSE;
- if (last_gi->event_mask & GD_EVENT_TEXT_LEAVING)
- last_gi->callback_action(last_gi);
+ DrawGadget(gi, DG_UNPRESSED, gi->direct_draw);
+
+ gi->event.type = GD_EVENT_TEXT_LEAVING;
+
+#if 1
+ if (gadget_changed && !(gi->type & GD_TYPE_SELECTBOX))
+ gi->callback_action(gi);
+#else
+ if (gi->event_mask & GD_EVENT_TEXT_LEAVING)
+ gi->callback_action(gi);
+#endif
last_gi = NULL;
gs->position = gs->position_max;
gs->item_position =
- gs->items_max * (gs->position + gs->correction) / gs->size_max;
+ gs->items_max * (gs->position + gs->correction) / gs->size_max_cmp;
if (gs->item_position < 0)
gs->item_position = 0;
if (gadget_released_inside)
{
boolean deactivate_gadget = TRUE;
+ boolean gadget_changed = TRUE;
if (gi->type & GD_TYPE_SELECTBOX)
{
#if 1
if (mouse_released_where_pressed ||
!gadget_released_inside_select_area) /* selectbox stays open */
+ {
deactivate_gadget = FALSE;
+ gadget_changed = FALSE;
+ }
#else
if (gadget_released_inside_select_line ||
gadget_released_off_borders) /* selectbox stays open */
+ {
deactivate_gadget = FALSE;
+ gadget_changed = FALSE;
+ }
#endif
- else
+ else if (gi->selectbox.index != gi->selectbox.current_index)
gi->selectbox.index = gi->selectbox.current_index;
+ else
+ gadget_changed = FALSE;
}
if (deactivate_gadget &&
gi->state = GD_BUTTON_UNPRESSED;
gi->event.type = GD_EVENT_RELEASED;
+#if 1
+ if ((gi->event_mask & GD_EVENT_RELEASED) && gadget_changed)
+ {
+ gi->callback_action(gi);
+ }
+#else
if ((gi->event_mask & GD_EVENT_RELEASED) && deactivate_gadget)
gi->callback_action(gi);
+#endif
}
if (gadget_released_off_borders)
if (key == KSYM_Return) /* valid for both text input and selectbox */
{
+ boolean gadget_changed = (gi->event_mask & GD_EVENT_TEXT_RETURN);
+
if (gi->type & GD_TYPE_TEXT_INPUT)
+ {
CheckRangeOfNumericInputGadget(gi);
+
+ if (strcmp(gi->textinput.value, gi->textinput.last_value) != 0)
+ strcpy(gi->textinput.last_value, gi->textinput.value);
+ else
+ gadget_changed = FALSE;
+ }
else if (gi->type & GD_TYPE_SELECTBOX)
- gi->selectbox.index = gi->selectbox.current_index;
+ {
+ if (gi->selectbox.index != gi->selectbox.current_index)
+ gi->selectbox.index = gi->selectbox.current_index;
+ else
+ gadget_changed = FALSE;
+ }
if (gi->type & GD_TYPE_TEXT_AREA)
{
last_gi = NULL;
}
+#if 1
+ if (gadget_changed)
+ gi->callback_action(gi);
+#else
if (gi->event_mask & GD_EVENT_TEXT_RETURN)
gi->callback_action(gi);
+#endif
}
else if (gi->type & GD_TYPE_TEXT_INPUT) /* only valid for text input */
{