Skip to content

Commit 04cf90c

Browse files
committed
Merge branch 'fixnull'
2 parents 6a983f0 + 9b06bec commit 04cf90c

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

src/ui/components/confirm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ component_t* confirm_create(
157157
confirm, icon_button_create(slider_position, ICON_BUTTON_CROSS, _on_cancel));
158158
}
159159
if (params->longtouch) {
160-
ui_util_add_sub_component(confirm, confirm_gesture_create(confirm));
160+
ui_util_add_sub_component(confirm, confirm_gesture_create());
161161
} else {
162162
ui_util_add_sub_component(
163163
confirm,

src/ui/components/confirm_button.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ static void _confirm(component_t* confirm_button)
2828
component_t* confirm_button_create(bool longtouch, icon_button_type_t button_type)
2929
{
3030
if (longtouch) {
31-
return confirm_gesture_create(NULL);
31+
return confirm_gesture_create();
3232
}
3333
return icon_button_create(top_slider, button_type, _confirm);
3434
}

src/ui/components/confirm_gesture.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,8 @@ static component_functions_t _component_functions = {
154154

155155
/**
156156
* Creates a confirm_gesture component on the top slider.
157-
* @param[in] parent The parent component.
158157
*/
159-
component_t* confirm_gesture_create(component_t* parent)
158+
component_t* confirm_gesture_create(void)
160159
{
161160
confirm_data_t* data = malloc(sizeof(confirm_data_t));
162161
if (!data) {
@@ -176,9 +175,6 @@ component_t* confirm_gesture_create(component_t* parent)
176175
memset(confirm_gesture, 0, sizeof(component_t));
177176
confirm_gesture->data = data;
178177
confirm_gesture->f = &_component_functions;
179-
confirm_gesture->parent = parent;
180-
181-
ui_util_position_right_top(parent, confirm_gesture);
182178

183179
return confirm_gesture;
184180
}

src/ui/components/confirm_gesture.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* Creates a confirm_gesture component on the top slider.
2525
* @param[in] parent The parent component.
2626
*/
27-
component_t* confirm_gesture_create(component_t* parent);
27+
component_t* confirm_gesture_create(void);
2828

2929
bool confirm_gesture_is_active(component_t* component);
3030

0 commit comments

Comments
 (0)