comparison: ui/gtk/entry.c
ui/gtk/entry.c
- changeset 112
- c3f2f16fa4b8
- parent 110
- c00e968d018b
equal
deleted
inserted
replaced
| 111:81c4f73236a4 | 112:c3f2f16fa4b8 |
|---|---|
| 37 | 37 |
| 38 UIWIDGET ui_spinbox_create(UiObject *obj, UiSpinBoxArgs *args) { | 38 UIWIDGET ui_spinbox_create(UiObject *obj, UiSpinBoxArgs *args) { |
| 39 double min = args->min; | 39 double min = args->min; |
| 40 double max = args->max != 0 ? args->max : 1000; | 40 double max = args->max != 0 ? args->max : 1000; |
| 41 | 41 |
| 42 UiObject* current = uic_current_obj(obj); | |
| 43 | |
| 44 UiVar *var = NULL; | 42 UiVar *var = NULL; |
| 45 UiVarType vartype = 0; | 43 UiVarType vartype = 0; |
| 46 if(args->varname) { | 44 if(args->varname) { |
| 47 var = uic_get_var(obj->ctx, args->varname); | 45 var = uic_get_var(obj->ctx, args->varname); |
| 48 if(var) { | 46 if(var) { |
| 49 vartype = var->type; | 47 vartype = var->type; |
| 50 } else { | 48 } else { |
| 51 var = uic_widget_var(obj->ctx, current->ctx, args->rangevalue, args->varname, UI_VAR_RANGE); | 49 var = uic_widget_var(obj->ctx, obj->ctx, args->rangevalue, args->varname, UI_VAR_RANGE); |
| 52 vartype = UI_VAR_RANGE; | 50 vartype = UI_VAR_RANGE; |
| 53 } | 51 } |
| 54 } | 52 } |
| 55 | 53 |
| 56 if(!var) { | 54 if(!var) { |
| 57 if(args->intvalue) { | 55 if(args->intvalue) { |
| 58 var = uic_widget_var(obj->ctx, current->ctx, args->intvalue, NULL, UI_VAR_INTEGER); | 56 var = uic_widget_var(obj->ctx, obj->ctx, args->intvalue, NULL, UI_VAR_INTEGER); |
| 59 vartype = UI_VAR_INTEGER; | 57 vartype = UI_VAR_INTEGER; |
| 60 } else if(args->doublevalue) { | 58 } else if(args->doublevalue) { |
| 61 var = uic_widget_var(obj->ctx, current->ctx, args->doublevalue, NULL, UI_VAR_DOUBLE); | 59 var = uic_widget_var(obj->ctx, obj->ctx, args->doublevalue, NULL, UI_VAR_DOUBLE); |
| 62 vartype = UI_VAR_DOUBLE; | 60 vartype = UI_VAR_DOUBLE; |
| 63 } else if(args->rangevalue) { | 61 } else if(args->rangevalue) { |
| 64 var = uic_widget_var(obj->ctx, current->ctx, args->rangevalue, NULL, UI_VAR_RANGE); | 62 var = uic_widget_var(obj->ctx, obj->ctx, args->rangevalue, NULL, UI_VAR_RANGE); |
| 65 vartype = UI_VAR_RANGE; | 63 vartype = UI_VAR_RANGE; |
| 66 } | 64 } |
| 67 } | 65 } |
| 68 | 66 |
| 69 if(vartype == UI_VAR_RANGE) { | 67 if(vartype == UI_VAR_RANGE) { |
| 142 spin, | 140 spin, |
| 143 "destroy", | 141 "destroy", |
| 144 G_CALLBACK(ui_destroy_vardata), | 142 G_CALLBACK(ui_destroy_vardata), |
| 145 event); | 143 event); |
| 146 | 144 |
| 147 UI_APPLY_LAYOUT2(current, args); | 145 UiContainerPrivate *ct = (UiContainerPrivate*)obj->container_end; |
| 148 current->container->add(current->container, spin); | 146 UiLayout layout = UI_ARGS2LAYOUT(args); |
| 147 ct->add(ct, spin, &layout); | |
| 149 | 148 |
| 150 return spin; | 149 return spin; |
| 151 } | 150 } |
| 152 | 151 |
| 153 void ui_spinner_setrange(UIWIDGET spinner, double min, double max) { | 152 void ui_spinner_setrange(UIWIDGET spinner, double min, double max) { |
