From e646da1ee08f8bc614400ce6f8de145690718b63 Mon Sep 17 00:00:00 2001 From: Jaehyun Cho Date: Wed, 17 Aug 2016 15:39:37 +0900 Subject: [PATCH] search: Move "Next" button to the right of "Previous" button. --- data/themes/default/layout_common.edc | 12 ++++++------ src/bin/search.c | 13 ++++++------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/data/themes/default/layout_common.edc b/data/themes/default/layout_common.edc index 81d9f88..b1d103e 100644 --- a/data/themes/default/layout_common.edc +++ b/data/themes/default/layout_common.edc @@ -1037,7 +1037,7 @@ group { "search_layout"; fixed: 1 1; } } - swallow { "elm.swallow.forward"; + swallow { "elm.swallow.backward"; scale: 1; desc { "default"; rel1.relative: 0 1; @@ -1052,13 +1052,13 @@ group { "search_layout"; fixed: 1 1; } } - swallow { "elm.swallow.backward"; + swallow { "elm.swallow.forward"; scale: 1; desc { "default"; rel1.relative: 1 0; rel2.relative: 1 1; - rel1.to: "elm.swallow.forward"; - rel2.to: "elm.swallow.forward"; + rel1.to: "elm.swallow.backward"; + rel2.to: "elm.swallow.backward"; rel1.offset: 5 0; min: 50 25; align: 0 0; @@ -1070,8 +1070,8 @@ group { "search_layout"; desc { "default"; rel1.relative: 1 0; rel2.relative: 1 1; - rel1.to: "elm.swallow.backward"; - rel2.to: "elm.swallow.backward"; + rel1.to: "elm.swallow.forward"; + rel2.to: "elm.swallow.forward"; rel1.offset: 5 0; min: 50 25; align: 0 0; diff --git a/src/bin/search.c b/src/bin/search.c index 20e3b54..12a7453 100644 --- a/src/bin/search.c +++ b/src/bin/search.c @@ -402,13 +402,6 @@ search_open(void) evas_object_size_hint_align_set(entry_replace, EVAS_HINT_FILL, 0); elm_object_part_content_set(layout, "elm.swallow.replace_entry", entry_replace); - //Button (forward) - Evas_Object *btn_forward = elm_button_add(layout); - elm_object_text_set(btn_forward, _("Next")); - evas_object_smart_callback_add(btn_forward, "clicked", forward_clicked_cb, - sd); - elm_object_part_content_set(layout, "elm.swallow.forward", btn_forward); - //Button (backward) Evas_Object *btn_backward = elm_button_add(layout); elm_object_text_set(btn_backward, _("Previous")); @@ -416,6 +409,12 @@ search_open(void) backward_clicked_cb, sd); elm_object_part_content_set(layout, "elm.swallow.backward", btn_backward); + //Button (forward) + Evas_Object *btn_forward = elm_button_add(layout); + elm_object_text_set(btn_forward, _("Next")); + evas_object_smart_callback_add(btn_forward, "clicked", forward_clicked_cb, + sd); + elm_object_part_content_set(layout, "elm.swallow.forward", btn_forward); //Button (replace) Evas_Object *btn_replace = elm_button_add(layout);