summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun.cho@samsung.com>2019-05-15 17:23:32 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2019-05-15 19:06:50 +0900
commit6fd7c3f727102f2206a5ac08ad56902b96d64713 (patch)
treef1b3022139f78b400b518ace9e4d2adf20b4d4bc /src
parent59ef5ab8f1ca625ef1011b5931c088599966eafa (diff)
efl_ui: fix to use Efl.Ui.Widget's "background" and "shadow" part class
To use Efl.Ui.Widget's "background" and "shadow" part class, each widget inheriting from Efl.Ui.Widget should not use their Part class for "background" and "shadow" parts.
Diffstat (limited to 'src')
-rw-r--r--src/lib/elementary/efl_ui_scroll_alert_popup.c12
-rw-r--r--src/lib/elementary/efl_ui_text.c12
-rw-r--r--src/lib/elementary/efl_ui_text_alert_popup.c12
-rw-r--r--src/lib/elementary/efl_ui_textpath.c13
4 files changed, 45 insertions, 4 deletions
diff --git a/src/lib/elementary/efl_ui_scroll_alert_popup.c b/src/lib/elementary/efl_ui_scroll_alert_popup.c
index 54e28c5643..3ea05b1b2b 100644
--- a/src/lib/elementary/efl_ui_scroll_alert_popup.c
+++ b/src/lib/elementary/efl_ui_scroll_alert_popup.c
@@ -282,7 +282,17 @@ _efl_ui_scroll_alert_popup_efl_object_constructor(Eo *obj,
282 282
283/* Efl.Part begin */ 283/* Efl.Part begin */
284 284
285ELM_PART_OVERRIDE(efl_ui_scroll_alert_popup, EFL_UI_SCROLL_ALERT_POPUP, Efl_Ui_Scroll_Alert_Popup_Data) 285static Eina_Bool
286_part_is_efl_ui_scroll_alert_popup_part(const Eo *obj EINA_UNUSED, const char *part)
287{
288 //Use Efl.Ui.Widget's "background" and "shadow" parts
289 if (eina_streq(part, "background") || eina_streq(part, "shadow"))
290 return EINA_FALSE;
291
292 return EINA_TRUE;
293}
294
295ELM_PART_OVERRIDE_PARTIAL(efl_ui_scroll_alert_popup, EFL_UI_SCROLL_ALERT_POPUP, Efl_Ui_Scroll_Alert_Popup_Data, _part_is_efl_ui_scroll_alert_popup_part)
286ELM_PART_OVERRIDE_CONTENT_SET(efl_ui_scroll_alert_popup, EFL_UI_SCROLL_ALERT_POPUP, Efl_Ui_Scroll_Alert_Popup_Data) 296ELM_PART_OVERRIDE_CONTENT_SET(efl_ui_scroll_alert_popup, EFL_UI_SCROLL_ALERT_POPUP, Efl_Ui_Scroll_Alert_Popup_Data)
287ELM_PART_OVERRIDE_CONTENT_GET(efl_ui_scroll_alert_popup, EFL_UI_SCROLL_ALERT_POPUP, Efl_Ui_Scroll_Alert_Popup_Data) 297ELM_PART_OVERRIDE_CONTENT_GET(efl_ui_scroll_alert_popup, EFL_UI_SCROLL_ALERT_POPUP, Efl_Ui_Scroll_Alert_Popup_Data)
288ELM_PART_OVERRIDE_CONTENT_UNSET(efl_ui_scroll_alert_popup, EFL_UI_SCROLL_ALERT_POPUP, Efl_Ui_Scroll_Alert_Popup_Data) 298ELM_PART_OVERRIDE_CONTENT_UNSET(efl_ui_scroll_alert_popup, EFL_UI_SCROLL_ALERT_POPUP, Efl_Ui_Scroll_Alert_Popup_Data)
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 9cef215288..87f2ca5cc2 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -4054,7 +4054,17 @@ _efl_ui_text_text_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *pd,
4054 4054
4055#undef STRCMP 4055#undef STRCMP
4056 4056
4057ELM_PART_OVERRIDE(efl_ui_text, EFL_UI_TEXT, Efl_Ui_Text_Data) 4057static Eina_Bool
4058_part_is_efl_ui_text_part(const Eo *obj EINA_UNUSED, const char *part)
4059{
4060 //Use Efl.Ui.Widget's "background" and "shadow" parts
4061 if (eina_streq(part, "background") || eina_streq(part, "shadow"))
4062 return EINA_FALSE;
4063
4064 return EINA_TRUE;
4065}
4066
4067ELM_PART_OVERRIDE_PARTIAL(efl_ui_text, EFL_UI_TEXT, Efl_Ui_Text_Data, _part_is_efl_ui_text_part)
4058ELM_PART_OVERRIDE_TEXT_SET(efl_ui_text, EFL_UI_TEXT, Efl_Ui_Text_Data) 4068ELM_PART_OVERRIDE_TEXT_SET(efl_ui_text, EFL_UI_TEXT, Efl_Ui_Text_Data)
4059ELM_PART_OVERRIDE_TEXT_GET(efl_ui_text, EFL_UI_TEXT, Efl_Ui_Text_Data) 4069ELM_PART_OVERRIDE_TEXT_GET(efl_ui_text, EFL_UI_TEXT, Efl_Ui_Text_Data)
4060#include "efl_ui_text_part.eo.c" 4070#include "efl_ui_text_part.eo.c"
diff --git a/src/lib/elementary/efl_ui_text_alert_popup.c b/src/lib/elementary/efl_ui_text_alert_popup.c
index 355b8c21f3..230328d21e 100644
--- a/src/lib/elementary/efl_ui_text_alert_popup.c
+++ b/src/lib/elementary/efl_ui_text_alert_popup.c
@@ -290,7 +290,17 @@ _efl_ui_text_alert_popup_efl_object_constructor(Eo *obj,
290 290
291/* Efl.Part begin */ 291/* Efl.Part begin */
292 292
293ELM_PART_OVERRIDE(efl_ui_text_alert_popup, EFL_UI_TEXT_ALERT_POPUP, Efl_Ui_Text_Alert_Popup_Data) 293static Eina_Bool
294_part_is_efl_ui_text_alert_popup_part(const Eo *obj EINA_UNUSED, const char *part)
295{
296 //Use Efl.Ui.Widget's "background" and "shadow" parts
297 if (eina_streq(part, "background") || eina_streq(part, "shadow"))
298 return EINA_FALSE;
299
300 return EINA_TRUE;
301}
302
303ELM_PART_OVERRIDE_PARTIAL(efl_ui_text_alert_popup, EFL_UI_TEXT_ALERT_POPUP, Efl_Ui_Text_Alert_Popup_Data, _part_is_efl_ui_text_alert_popup_part)
294ELM_PART_OVERRIDE_CONTENT_SET(efl_ui_text_alert_popup, EFL_UI_TEXT_ALERT_POPUP, Efl_Ui_Text_Alert_Popup_Data) 304ELM_PART_OVERRIDE_CONTENT_SET(efl_ui_text_alert_popup, EFL_UI_TEXT_ALERT_POPUP, Efl_Ui_Text_Alert_Popup_Data)
295ELM_PART_OVERRIDE_CONTENT_GET(efl_ui_text_alert_popup, EFL_UI_TEXT_ALERT_POPUP, Efl_Ui_Text_Alert_Popup_Data) 305ELM_PART_OVERRIDE_CONTENT_GET(efl_ui_text_alert_popup, EFL_UI_TEXT_ALERT_POPUP, Efl_Ui_Text_Alert_Popup_Data)
296ELM_PART_OVERRIDE_CONTENT_UNSET(efl_ui_text_alert_popup, EFL_UI_TEXT_ALERT_POPUP, Efl_Ui_Text_Alert_Popup_Data) 306ELM_PART_OVERRIDE_CONTENT_UNSET(efl_ui_text_alert_popup, EFL_UI_TEXT_ALERT_POPUP, Efl_Ui_Text_Alert_Popup_Data)
diff --git a/src/lib/elementary/efl_ui_textpath.c b/src/lib/elementary/efl_ui_textpath.c
index 593339c059..10165607c7 100644
--- a/src/lib/elementary/efl_ui_textpath.c
+++ b/src/lib/elementary/efl_ui_textpath.c
@@ -748,7 +748,18 @@ _efl_ui_textpath_ellipsis_get(const Eo *obj EINA_UNUSED, Efl_Ui_Textpath_Data *p
748} 748}
749 749
750/* Efl.Part begin */ 750/* Efl.Part begin */
751ELM_PART_OVERRIDE(efl_ui_textpath, EFL_UI_TEXTPATH, Efl_Ui_Textpath_Data) 751
752static Eina_Bool
753_part_is_efl_ui_textpath_part(const Eo *obj EINA_UNUSED, const char *part)
754{
755 //Use Efl.Ui.Widget's "background" and "shadow" parts
756 if (eina_streq(part, "background") || eina_streq(part, "shadow"))
757 return EINA_FALSE;
758
759 return EINA_TRUE;
760}
761
762ELM_PART_OVERRIDE_PARTIAL(efl_ui_textpath, EFL_UI_TEXTPATH, Efl_Ui_Textpath_Data, _part_is_efl_ui_textpath_part)
752ELM_PART_OVERRIDE_TEXT_SET(efl_ui_textpath, EFL_UI_TEXTPATH, Efl_Ui_Textpath_Data) 763ELM_PART_OVERRIDE_TEXT_SET(efl_ui_textpath, EFL_UI_TEXTPATH, Efl_Ui_Textpath_Data)
753ELM_PART_OVERRIDE_TEXT_GET(efl_ui_textpath, EFL_UI_TEXTPATH, Efl_Ui_Textpath_Data) 764ELM_PART_OVERRIDE_TEXT_GET(efl_ui_textpath, EFL_UI_TEXTPATH, Efl_Ui_Textpath_Data)
754#include "efl_ui_textpath_part.eo.c" 765#include "efl_ui_textpath_part.eo.c"