From 98d1c617d16ef45a2253db4a4b2bff379c75c9f0 Mon Sep 17 00:00:00 2001 From: Eugene Kurzberg Date: Thu, 13 Oct 2016 09:33:48 +0300 Subject: [PATCH] Minor GUI updates. Change-Id: I5c8139987098208c2d592b88d3d1583ab0663014 Signed-off-by: Eugene Kurzberg --- .../res/widget/edje/widget-item-layout.edc | 4 +- .../res/list/edje/chooser-title-layout.edc | 44 +++++++++++++------- .../Contacts/Chooser/ContactsGroupsNavigator.cpp | 10 +++++ .../res/dialer/edje/dialer-predictive-layout.edc | 2 +- lib-phone/res/speed-dial/edje/SpeedDialPath.h | 7 ++-- .../res/speed-dial/edje/speed-dial-layout.edc | 46 ++------------------- .../images/keypad_speed_dial_del_press.png | Bin 0 -> 3163 bytes 7 files changed, 50 insertions(+), 63 deletions(-) create mode 100644 lib-phone/res/speed-dial/images/keypad_speed_dial_del_press.png diff --git a/contacts-widget/res/widget/edje/widget-item-layout.edc b/contacts-widget/res/widget/edje/widget-item-layout.edc index b8c1718..822e7ba 100644 --- a/contacts-widget/res/widget/edje/widget-item-layout.edc +++ b/contacts-widget/res/widget/edje/widget-item-layout.edc @@ -30,7 +30,7 @@ #define NAME_H (40*2) #define NAME_T 5 -#define NAME_TEXT_SIZE 28 +#define NAME_TEXT_SIZE 30 styles { style { @@ -46,7 +46,7 @@ color_classes { } color_class { name: "button_add_bg_pressed"; - color: 240 240 240 77; + color: 255 255 255 77; } color_class { name: "button_add_border"; diff --git a/lib-contacts/res/list/edje/chooser-title-layout.edc b/lib-contacts/res/list/edje/chooser-title-layout.edc index 3e0646f..3824343 100644 --- a/lib-contacts/res/list/edje/chooser-title-layout.edc +++ b/lib-contacts/res/list/edje/chooser-title-layout.edc @@ -19,7 +19,17 @@ #define SELECTOR_LR 32 #define SELECTOR_TB 20 -#define SELECTOR_H 120 + +color_classes { + color_class { + name: "bg"; + color: 250 250 250 255; + } + color_class { + name: "selector_bg"; + color: 61 185 204 255; + } +} collections { base_scale: 2.6; @@ -28,11 +38,18 @@ collections { parts { rect { "rect.bg"; scale; desc { "default"; - min: 0 SELECTOR_H; - color: 250 250 250 255; + color_class: "bg"; + } + } + rect { "rect.selector_bg"; scale; + desc { "default"; + align: 0.0 0.0; + rel1 { relative: 0.0 0.0; to: "spacer.selector.left_top"; } + rel2 { relative: 1.0 1.0; to: "spacer.selector.right_bottom"; } + color_class: "selector_bg"; } } - spacer { "spacer.left_top"; scale; + spacer { "spacer.selector.left_top"; scale; desc { "default"; min: SELECTOR_LR SELECTOR_TB; align: 0.0 0.0; @@ -40,26 +57,25 @@ collections { rel2.relative: 0.0 0.0; } } - spacer { "spacer.right_bottom"; scale; + spacer { "spacer.selector.right_bottom"; scale; desc { "default"; min: SELECTOR_LR SELECTOR_TB; align: 1.0 1.0; - rel1.relative: 1.0 1.0; - rel2.relative: 1.0 1.0; + rel1 { relative: 1.0 0.0; to_y: PART_MULTI_BTN; } + rel2 { relative: 1.0 0.0; to_y: PART_MULTI_BTN; } } } swallow { PART_SELECTOR; scale; desc { "default"; - align: 0.0 0.0; - rel1 { relative: 1.0 1.0; to: "spacer.left_top"; } - rel2 { relative: 0.0 1.0; to_x: "spacer.right_bottom"; to_y: "spacer.left_top"; } + align: 0.0 0.5; + rel1 { relative: 1.0 1.0; to: "spacer.selector.left_top"; } + rel2 { relative: 0.0 0.0; to: "spacer.selector.right_bottom"; } } } - swallow { PART_MULTI_BTN; scale; + swallow { PART_MULTI_BTN; desc { "default"; - align: 0.0 0.0; - rel1 { relative: 0.0 1.0; to_y: PART_SELECTOR; } - rel2 { relative: 1.0 1.0; } + align: 0.0 1.0; + rel1 { relative: 0.0 1.0; } } } } diff --git a/lib-contacts/src/Contacts/Chooser/ContactsGroupsNavigator.cpp b/lib-contacts/src/Contacts/Chooser/ContactsGroupsNavigator.cpp index 08151fe..2b05245 100644 --- a/lib-contacts/src/Contacts/Chooser/ContactsGroupsNavigator.cpp +++ b/lib-contacts/src/Contacts/Chooser/ContactsGroupsNavigator.cpp @@ -34,6 +34,9 @@ #define MULTI_BTN_ITEM_H 76 #define MULTI_BTN_LINE_MAX 3 +#define COLOR_HOVERSEL_BG_PRESSED 0, 0, 0, 77, 0, 0, 0, 0, 0, 0, 0, 0 +#define COLOR_HOVERSEL_FG 250, 250, 250, 255, 0, 0, 0, 0, 0, 0, 0, 0 + using namespace Contacts; using namespace Contacts::Chooser; @@ -88,6 +91,13 @@ void ContactsGroupsNavigator::onCreated() elm_object_part_content_set(m_TitleLayout, PART_SELECTOR, getSelector()->create(m_TitleLayout)); elm_object_part_content_set(m_TitleLayout, PART_MULTI_BTN, m_MultiBtnBox); + + Evas_Object *edje = elm_layout_edje_get(getSelector()->getEvasObject()); + edje_object_color_class_set(edje, "hoversel/default/bg-pressed", COLOR_HOVERSEL_BG_PRESSED); + edje_object_color_class_set(edje, "hoversel/default/icon", COLOR_HOVERSEL_FG); + edje_object_color_class_set(edje, "hoversel/default/underline", COLOR_HOVERSEL_FG); + edje_object_color_class_set(edje, "hoversel/default/text-normal", COLOR_HOVERSEL_FG); + edje_object_color_class_set(edje, "hoversel/default/text-pressed", COLOR_HOVERSEL_FG); } void ContactsGroupsNavigator::onPageAttached(Ui::NavigatorPage *page) diff --git a/lib-phone/res/dialer/edje/dialer-predictive-layout.edc b/lib-phone/res/dialer/edje/dialer-predictive-layout.edc index 1631638..79a8ed2 100644 --- a/lib-phone/res/dialer/edje/dialer-predictive-layout.edc +++ b/lib-phone/res/dialer/edje/dialer-predictive-layout.edc @@ -75,7 +75,7 @@ color_classes { } color_class { name: "predictive_bg_pressed"; - color: 0 0 0 25; + color: 255 255 255 50; } color_class { //AO027 name: "speed_dial_bg"; diff --git a/lib-phone/res/speed-dial/edje/SpeedDialPath.h b/lib-phone/res/speed-dial/edje/SpeedDialPath.h index d5e8b09..96eb1e9 100644 --- a/lib-phone/res/speed-dial/edje/SpeedDialPath.h +++ b/lib-phone/res/speed-dial/edje/SpeedDialPath.h @@ -23,8 +23,9 @@ #define SPEED_DIAL_LAYOUT_EDJ SPEED_DIAL_EDJ_DIR"speed-dial-layout.edj" -#define ICON_BG SPEED_DIAL_IMG_DIR"keypad_speed_dial_bg.png" -#define ICON_ADD SPEED_DIAL_IMG_DIR"keypad_speed_dial_add.png" -#define ICON_DEL SPEED_DIAL_IMG_DIR"keypad_speed_dial_del.png" +#define ICON_BG SPEED_DIAL_IMG_DIR"keypad_speed_dial_bg.png" +#define ICON_ADD SPEED_DIAL_IMG_DIR"keypad_speed_dial_add.png" +#define ICON_DEL SPEED_DIAL_IMG_DIR"keypad_speed_dial_del.png" +#define ICON_DEL_PRESSED SPEED_DIAL_IMG_DIR"keypad_speed_dial_del_press.png" #endif /* SPEED_DIAL_PATH_H */ diff --git a/lib-phone/res/speed-dial/edje/speed-dial-layout.edc b/lib-phone/res/speed-dial/edje/speed-dial-layout.edc index d6c5e7f..3104d83 100644 --- a/lib-phone/res/speed-dial/edje/speed-dial-layout.edc +++ b/lib-phone/res/speed-dial/edje/speed-dial-layout.edc @@ -50,7 +50,7 @@ color_classes { } color_class { name: "button_add_bg_pressed"; - color: 61 185 204 255; + color: 61 185 204 128; } color_class { name: "button_add_bg_unpressed"; @@ -61,6 +61,8 @@ color_classes { collections { base_scale: 2.6; + IMAGE_WITH_TOUCH(LAYOUT_BUTTON_DEL, ICON_DEL, ICON_DEL_PRESSED); + group { LAYOUT_MAIN; parts { rect { "rect.bg"; @@ -154,48 +156,6 @@ collections { } } } - group { LAYOUT_BUTTON_DEL; - images { - image: ICON_BG COMP; - image: ICON_DEL COMP; - } - parts { - image { "image.icon"; - desc { "default"; - image.normal: ICON_DEL; - } - } - image { "image.press_bg"; - desc { "default"; - rel1.relative: 0.05 0.05; //FIXME: Replace with pressed image - rel2.relative: 0.95 0.95; - image.normal: ICON_BG; - color: 0 0 0 0; - } - desc { "pressed"; - inherit: "default"; - color: 0 0 0 77; - } - } - } - programs { - program { - name: "pressed"; - signal: "mouse,down,*"; - source: "*"; - action: STATE_SET "pressed" 0.0; - target: "image.press_bg"; - } - program { - name: "unpressed"; - signal: "mouse,up,*"; - source: "*"; - action: STATE_SET "default" 0.0; - target: "image.press_bg"; - transition: TRANSITION_GLIDE(0.45); - } - } - } group { LAYOUT_ITEM; parts { swallow { PART_THUMBNAIL; scale; diff --git a/lib-phone/res/speed-dial/images/keypad_speed_dial_del_press.png b/lib-phone/res/speed-dial/images/keypad_speed_dial_del_press.png new file mode 100644 index 0000000000000000000000000000000000000000..56033f695f22bdebf4927a2d0ad40614ef2edf10 GIT binary patch literal 3163 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 po8HO^T%ip;qO<(F??7}W+_LqL{SQ$)dKv%# literal 0 HcmV?d00001 -- 2.7.4