From abfe933f90a87ceb92690ae2a7fc690a4273f769 Mon Sep 17 00:00:00 2001 From: Erwin Ried <1091420+eried@users.noreply.github.com> Date: Sun, 9 Aug 2020 02:49:56 +0200 Subject: [PATCH 1/4] Change title to label because it is not selectable --- src/pages/128x64x1/advanced/mixer_curves.c | 3 ++- src/pages/128x64x1/guiobj.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pages/128x64x1/advanced/mixer_curves.c b/src/pages/128x64x1/advanced/mixer_curves.c index 78f09b9526..4af8020e1b 100644 --- a/src/pages/128x64x1/advanced/mixer_curves.c +++ b/src/pages/128x64x1/advanced/mixer_curves.c @@ -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) diff --git a/src/pages/128x64x1/guiobj.h b/src/pages/128x64x1/guiobj.h index 7bb24cd28d..b631a85b14 100644 --- a/src/pages/128x64x1/guiobj.h +++ b/src/pages/128x64x1/guiobj.h @@ -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; From 7edb5de283b851a20a839287fbc9d8629512bda0 Mon Sep 17 00:00:00 2001 From: Erwin Ried <1091420+eried@users.noreply.github.com> Date: Sun, 9 Aug 2020 02:50:08 +0200 Subject: [PATCH 2/4] This function is not used anymore --- src/pages/common/advanced/_mixer_curves.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/common/advanced/_mixer_curves.c b/src/pages/common/advanced/_mixer_curves.c index ca72f3ef22..9888361073 100644 --- a/src/pages/common/advanced/_mixer_curves.c +++ b/src/pages/common/advanced/_mixer_curves.c @@ -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); @@ -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; @@ -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; From 493f7b6a8397a50ffaf5c584bc020518445cba82 Mon Sep 17 00:00:00 2001 From: Erwin Ried <1091420+eried@users.noreply.github.com> Date: Sun, 9 Aug 2020 02:50:27 +0200 Subject: [PATCH 3/4] Value selected by default --- src/pages/128x64x1/advanced/mixer_curves.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/128x64x1/advanced/mixer_curves.c b/src/pages/128x64x1/advanced/mixer_curves.c index 4af8020e1b..4f199ac818 100644 --- a/src/pages/128x64x1/advanced/mixer_curves.c +++ b/src/pages/128x64x1/advanced/mixer_curves.c @@ -90,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) From 580947fb2fb05283af452f6e0c80bab3e4fea7de Mon Sep 17 00:00:00 2001 From: Erwin Ried <1091420+eried@users.noreply.github.com> Date: Sun, 9 Aug 2020 03:06:44 +0200 Subject: [PATCH 4/4] Space on comments --- src/pages/128x64x1/advanced/mixer_curves.c | 2 +- src/pages/128x64x1/guiobj.h | 2 +- src/pages/common/advanced/_mixer_curves.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/128x64x1/advanced/mixer_curves.c b/src/pages/128x64x1/advanced/mixer_curves.c index 4f199ac818..abdfbbf648 100644 --- a/src/pages/128x64x1/advanced/mixer_curves.c +++ b/src/pages/128x64x1/advanced/mixer_curves.c @@ -58,7 +58,7 @@ 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 diff --git a/src/pages/128x64x1/guiobj.h b/src/pages/128x64x1/guiobj.h index b631a85b14..9b0dbb97a1 100644 --- a/src/pages/128x64x1/guiobj.h +++ b/src/pages/128x64x1/guiobj.h @@ -270,7 +270,7 @@ struct crsfdevice_obj { /****Advanced ****/ struct advcurve_obj { - //guiTextSelect_t name; + // guiTextSelect_t name; guiLabel_t title; guiButton_t save; guiRect_t rect; diff --git a/src/pages/common/advanced/_mixer_curves.c b/src/pages/common/advanced/_mixer_curves.c index 9888361073..fc8cb64e82 100644 --- a/src/pages/common/advanced/_mixer_curves.c +++ b/src/pages/common/advanced/_mixer_curves.c @@ -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);