Skip to content

Advcurve ui bugfix #997

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Advcurve ui bugfix #997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
abfe933
Change title to label because it is not selectable
eried Aug 9, 2020
7edb5de
This function is not used anymore
eried Aug 9, 2020
493f7b6
Value selected by default
eried Aug 9, 2020
580947f
Space on comments
eried Aug 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/pages/128x64x1/advanced/mixer_curves.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ void PAGE_EditCurvesInit(int page)
}
edit->curve = *curve;

GUI_CreateTextSelectPlate(&gui->name, NAME_X, 0, NAME_W, HEADER_HEIGHT, &TEXTSEL_FONT, NULL, set_curvename_cb, NULL);
// GUI_CreateTextSelectPlate(&gui->name, NAME_X, 0, NAME_W, HEADER_HEIGHT, &TEXTSEL_FONT, NULL, set_curvename_cb, NULL);
GUI_CreateLabelBox(&gui->title, NAME_X, 0 , NAME_W, HEADER_HEIGHT, &LABEL_FONT, GUI_Localize, NULL, _tr(CURVE_GetName(tempstring, curve)));
GUI_CreateButtonPlateText(&gui->save, SAVE_X, 0, SAVE_W, HEADER_WIDGET_HEIGHT, &BUTTON_FONT , GUI_Localize, okcancel_cb, _tr_noop("Save"));
// Draw a line
if (UNDERLINE)
Expand Down Expand Up @@ -89,7 +90,7 @@ void PAGE_EditCurvesInit(int page)
CHAN_MAX_VALUE, CHAN_MAX_VALUE,
0, 0, //CHAN_MAX_VALUE / 4, CHAN_MAX_VALUE / 4,
show_curve_cb, NULL, touch_cb, &edit->curve);
GUI_SetSelected((guiObject_t *)&gui->point);
GUI_SetSelected((guiObject_t *)&gui->value);
}

static unsigned action_cb(u32 button, unsigned flags, void *data)
Expand Down
3 changes: 2 additions & 1 deletion src/pages/128x64x1/guiobj.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,8 @@ struct crsfdevice_obj {

/****Advanced ****/
struct advcurve_obj {
guiTextSelect_t name;
// guiTextSelect_t name;
guiLabel_t title;
guiButton_t save;
guiRect_t rect;
guiLabel_t pointlbl;
Expand Down
6 changes: 3 additions & 3 deletions src/pages/common/advanced/_mixer_curves.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ static struct advcurve_obj * const gui = &gui_objs.u.advcurve;
static struct curve_edit * const edit = &pagemem.u.mixer_page.edit;

static void okcancel_cb(guiObject_t *obj, const void *data);
static const char *set_curvename_cb(guiObject_t *obj, int dir, void *data);
// static const char *set_curvename_cb(guiObject_t *obj, int dir, void *data);
static const char *set_pointnum_cb(guiObject_t *obj, int dir, void *data);
static const char *set_expopoint_cb(guiObject_t *obj, int dir, void *data);
static const char *set_value_cb(guiObject_t *obj, int dir, void *data);
Expand All @@ -42,7 +42,7 @@ s32 show_curve_cb(s32 xval, void *data)
return yval;
}

static const char *set_curvename_cb(guiObject_t *obj, int dir, void *data)
/*static const char *set_curvename_cb(guiObject_t *obj, int dir, void *data)
{
(void)data;
(void)obj;
Expand All @@ -58,7 +58,7 @@ static const char *set_curvename_cb(guiObject_t *obj, int dir, void *data)
}
}
return _tr(CURVE_GetName(tempstring, curve));
}
}*/
static void okcancel_cb(guiObject_t *obj, const void *data)
{
(void)obj;
Expand Down