projects
/
framework
/
uifw
/
elementary.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
c16e231
)
[elm_widget][merge] bug fix for default theme reloading
author
Sohyun Kim
<anna1014.kim@samsung.com>
Mon, 17 Jan 2011 01:13:19 +0000
(10:13 +0900)
committer
Sohyun Kim
<anna1014.kim@samsung.com>
Mon, 17 Jan 2011 01:13:19 +0000
(10:13 +0900)
src/lib/elm_widget.c
patch
|
blob
|
history
diff --git
a/src/lib/elm_widget.c
b/src/lib/elm_widget.c
index
48393b5
..
8d2243d
100644
(file)
--- a/
src/lib/elm_widget.c
+++ b/
src/lib/elm_widget.c
@@
-479,12
+479,15
@@
elm_widget_theme_specific(Evas_Object *obj, Elm_Theme *th, Eina_Bool force)
Evas_Object *child;
Elm_Tooltip *tt;
Elm_Cursor *cur;
- Elm_Theme *th2;
+ Elm_Theme *th2
, *thdef
;
API_ENTRY return;
+ thdef = elm_theme_default_get();
+ if (!th) th = thdef;
if (!force)
{
th2 = sd->theme;
+ if (!th2) th2 = thdef;
while (th2)
{
if (th2 == th)
@@
-492,7
+495,9
@@
elm_widget_theme_specific(Evas_Object *obj, Elm_Theme *th, Eina_Bool force)
force = EINA_TRUE;
break;
}
- th2 = th->ref_theme;
+ if (th2 == thdef) break;
+ th2 = th2->ref_theme;
+ if (!th2) th2 = thdef;
}
}
if (!force) return;