From 1a9f44f993495d12474ca3c1442baf2955fe1a81 Mon Sep 17 00:00:00 2001 From: Daniel Juyung Seo Date: Wed, 16 Jan 2013 11:49:31 +0000 Subject: [PATCH] elm thumb: Fixed thumb theme hook. SVN revision: 82882 --- legacy/elementary/ChangeLog | 3 +++ legacy/elementary/NEWS | 1 + legacy/elementary/src/lib/elm_thumb.c | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+) diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog index 527e7da045..1280d9426b 100644 --- a/legacy/elementary/ChangeLog +++ b/legacy/elementary/ChangeLog @@ -920,3 +920,6 @@ * allocate conformant part dummy objects only when the swallow parts are existed actually. since these parts are really dependent on the platform, in most case they don't need all parts at the same time. +2013-01-16 Daniel Juyung Seo (SeoZ) + + * Fix thumb theme hook. diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS index d62e7c6e5b..d7a7fcb42a 100644 --- a/legacy/elementary/NEWS +++ b/legacy/elementary/NEWS @@ -125,6 +125,7 @@ Fixes: * Fix omitting signal emission when customized text parts change the text. * Fix "changed" signal being sent twice in case of toggle style when check is clicked. * Fix index refill bug when autohide disabled. + * Fix thumb theme hook. Removals: diff --git a/legacy/elementary/src/lib/elm_thumb.c b/legacy/elementary/src/lib/elm_thumb.c index c4c45e8e68..f6697bb263 100644 --- a/legacy/elementary/src/lib/elm_thumb.c +++ b/legacy/elementary/src/lib/elm_thumb.c @@ -520,6 +520,24 @@ _elm_thumb_dnd_cb(void *data __UNUSED__, return EINA_TRUE; } +static void +_elm_thumb_smart_theme(Eo *obj, void *_pd __UNUSED__, va_list *list) +{ + Eina_Bool *ret = va_arg(*list, Eina_Bool *); + if (ret) *ret = EINA_FALSE; + Eina_Bool int_ret = EINA_FALSE; + Elm_Widget_Smart_Data *wd = eo_data_get(obj, ELM_OBJ_WIDGET_CLASS); + + eo_do_super(obj, elm_wdg_theme(&int_ret)); + if (!int_ret) return; + + elm_layout_theme_set + (wd->resize_obj, "thumb", "base", + elm_widget_style_get(obj)); + + if (ret) *ret = EINA_TRUE; +} + EAPI Eina_Bool elm_need_ethumb(void) { @@ -848,6 +866,8 @@ _class_constructor(Eo_Class *klass) const Eo_Op_Func_Description func_desc[] = { EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), + EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_thumb_smart_theme), + EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_thumb_smart_add), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_thumb_smart_del), EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_SHOW), _elm_thumb_smart_show),