projects
/
profile
/
ivi
/
efl-theme-tizen.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix theme breakage exposed with updated EFL
[profile/ivi/efl-theme-tizen.git]
/
themes
/
widgets
/
popup.edc
diff --git
a/themes/widgets/popup.edc
b/themes/widgets/popup.edc
index
b82b8f4
..
f1f2946
100644
(file)
--- a/
themes/widgets/popup.edc
+++ b/
themes/widgets/popup.edc
@@
-206,7
+206,7
@@
group { name: "elm/label/base/popup/default";
styles
{
style { name: "popup_desc_style";
styles
{
style { name: "popup_desc_style";
- base: "font=SLP:style=Roman font_size="POPUP_DESCRIPTION_DEFAULT_TEXT_FONT_SIZE_INC" align=center color="POPUP_DEFAULT_DESCRIPTION_TEXT_COLOR_INC" text_class=slp_roman";
+ base: "font=SLP:style=Roman font_size="POPUP_DESCRIPTION_DEFAULT_TEXT_FONT_SIZE_INC" align=center color="POPUP_DEFAULT_DESCRIPTION_TEXT_COLOR_INC" text_class=slp_roman
wrap=mixed ellipsis=1
";
tag: "br" "\n";
tag: "ps" "ps";
tag: "whitecolor" "+ color=#ffffff";
tag: "br" "\n";
tag: "ps" "ps";
tag: "whitecolor" "+ color=#ffffff";
@@
-220,10
+220,10
@@
group { name: "elm/label/base/popup/default";
scale: 1;
description { state: "default" 0.0;
min: POPUP_DESCRIPTION_DEFAULT_TEXT_MIN_INC;
scale: 1;
description { state: "default" 0.0;
min: POPUP_DESCRIPTION_DEFAULT_TEXT_MIN_INC;
+ max: POPUP_DESCRIPTION_DEFAULT_TEXT_MIN_INC;
text {
style: "popup_desc_style";
text {
style: "popup_desc_style";
- min: 0 1;
- max: 0 1;
+ min: 0 0;
}
}
}
}
}
}
@@
-334,6
+334,7
@@
group { name: "elm/popup/base/default";
type: TEXTBLOCK;
scale:1;
description { state: "default" 0.0;
type: TEXTBLOCK;
scale:1;
description { state: "default" 0.0;
+ fixed: 1 1;
text {
style: "popup_title_style";
min: 0 0;
text {
style: "popup_title_style";
min: 0 0;
@@
-361,6
+362,7
@@
group { name: "elm/popup/base/default";
scale : 1;
description { state: "default" 0.0;
min: POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC;
scale : 1;
description { state: "default" 0.0;
min: POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC;
+ max: POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC;
fixed: 1 0;
rel1 {
relative: 0.5 0.0;
fixed: 1 0;
rel1 {
relative: 0.5 0.0;
@@
-1004,6
+1006,7
@@
group { name: "elm/popup/base/verticalbuttonstyle";
scale : 1;
description { state: "default" 0.0;
min: POPUP_BASE_VERTICAL_BUTTON_CONTENT_DEFAULT_MIN_INC;
scale : 1;
description { state: "default" 0.0;
min: POPUP_BASE_VERTICAL_BUTTON_CONTENT_DEFAULT_MIN_INC;
+ max: POPUP_BASE_VERTICAL_BUTTON_CONTENT_DEFAULT_MIN_INC;
fixed: 1 0;
rel1 {
relative: 0.5 0.0;
fixed: 1 0;
rel1 {
relative: 0.5 0.0;
@@
-1272,6
+1275,7
@@
group { name: "elm/popup/content/menustyle";
scale : 1;
description { state: "default" 0.0;
min: POPUP_CONTENT_LISTSTYLE_CONTENT_DEFAULT_MIN_INC;
scale : 1;
description { state: "default" 0.0;
min: POPUP_CONTENT_LISTSTYLE_CONTENT_DEFAULT_MIN_INC;
+ max: POPUP_CONTENT_LISTSTYLE_CONTENT_DEFAULT_MIN_INC;
align: 0.5 0.5;
fixed: 1 0;
rel1 {
align: 0.5 0.5;
fixed: 1 0;
rel1 {
@@
-1375,6
+1379,7
@@
group { name: "elm/popup/content/liststyle";
scale : 1;
description { state: "default" 0.0;
min: POPUP_CONTENT_LISTSTYLE_CONTENT_DEFAULT_MIN_INC;
scale : 1;
description { state: "default" 0.0;
min: POPUP_CONTENT_LISTSTYLE_CONTENT_DEFAULT_MIN_INC;
+ max: POPUP_CONTENT_LISTSTYLE_CONTENT_DEFAULT_MIN_INC;
align: 0.5 0.5;
fixed: 1 0;
rel1 {
align: 0.5 0.5;
fixed: 1 0;
rel1 {
@@
-1568,6
+1573,7
@@
group { name: "elm/popup/base/customstyle";
scale : 1;
description { state: "default" 0.0;
min: POPUP_BASE_CUSTOMSTYLE_CONTENT_DEFAULT_MIN_INC;
scale : 1;
description { state: "default" 0.0;
min: POPUP_BASE_CUSTOMSTYLE_CONTENT_DEFAULT_MIN_INC;
+ max: POPUP_BASE_CUSTOMSTYLE_CONTENT_DEFAULT_MIN_INC;
fixed: 1 0;
rel1 {
relative: 0.5 0.0;
fixed: 1 0;
rel1 {
relative: 0.5 0.0;
@@
-1882,7
+1888,7
@@
group { name: "elm/popup/buttons3/default";
group { name: "elm/popup/base/volumebarstyle";
images {
group { name: "elm/popup/base/volumebarstyle";
images {
- image: "00_
volume
popup_title_bg.png" COMP;
+ image: "00_popup_title_bg.png" COMP;
image: "00_popup_bottom_bg.png" COMP;
image: "00_popup_bg.png" COMP;
}
image: "00_popup_bottom_bg.png" COMP;
image: "00_popup_bg.png" COMP;
}
@@
-1905,11
+1911,11
@@
group { name: "elm/popup/base/volumebarstyle";
type: IMAGE;
scale : 1;
description { state: "default" 0.0;
type: IMAGE;
scale : 1;
description { state: "default" 0.0;
- min: POPUP_BASE_DEFAULT_TITLE_
DEFAULT
_MIN_INC;
+ min: POPUP_BASE_DEFAULT_TITLE_
VOLUMEBAR
_MIN_INC;
fixed : 1 1;
align: 0.5 0.0;
visible: 0;
fixed : 1 1;
align: 0.5 0.0;
visible: 0;
- image.normal: "00_
volume
popup_title_bg.png";
+ image.normal: "00_popup_title_bg.png";
image.border: POPUP_BASE_VOLUMEBAR_STYLE_TITLE_DEFAULT_IMAGE_BORDER_INC;
image.border_scale: 1;
rel1 {
image.border: POPUP_BASE_VOLUMEBAR_STYLE_TITLE_DEFAULT_IMAGE_BORDER_INC;
image.border_scale: 1;
rel1 {
@@
-2215,6
+2221,7
@@
group { name: "elm/popup/content/volumebarstyle";
scale : 1;
description { state: "default" 0.0;
min: POPUP_CONTENT_VOLUMEBAR_STYLE_CONTENT_DEFAULT_MIN_INC;
scale : 1;
description { state: "default" 0.0;
min: POPUP_CONTENT_VOLUMEBAR_STYLE_CONTENT_DEFAULT_MIN_INC;
+ max: POPUP_CONTENT_VOLUMEBAR_STYLE_CONTENT_DEFAULT_MIN_INC;
align: 0.5 0.5;
fixed: 1 0;
rel1 {
align: 0.5 0.5;
fixed: 1 0;
rel1 {
@@
-2541,7
+2548,8
@@
group { name: "elm/popup/base/content_expand";
type: SWALLOW;
scale : 1;
description { state: "default" 0.0;
type: SWALLOW;
scale : 1;
description { state: "default" 0.0;
- fixed: 1 0;
+ min: POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC;
+ max: POPUP_BASE_DEFAULT_CONTENT_DEFAULT_MIN_MAX_INC;
rel1.relative: 0.5 0.0;
rel2.relative: 0.5 1.0;
}
rel1.relative: 0.5 0.0;
rel2.relative: 0.5 1.0;
}
@@
-2761,9
+2769,6
@@
group { name: "elm/popup/buttons3/content_expand";
group { name: "elm/popup/item/content_expand";
inherit: "elm/popup/item/default";
group { name: "elm/popup/item/content_expand";
inherit: "elm/popup/item/default";
- script {
- public item_state = POPUP_ITEM_STATE_ENABLED;
- }
parts {
part { name: "bg";
mouse_events: 0;
parts {
part { name: "bg";
mouse_events: 0;