summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2017-06-09 20:20:47 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2017-06-09 20:20:47 -0400
commit84c79f6c496b766b32ac0df6edfb284ff8e7e5f3 (patch)
tree4aa5dba3272b49e16ed26c189611803f930c9bf3 /data
parent2ba847f4c2b258f78d56d658d117c834df1df2c8 (diff)
Revert "Revert "Edje calc: Fix textblock size calculation logic""
This reverts commit 0392cd3c489ee1c69dc768b2c3e8ac01ba1854c1. oops this was supposed to just be local
Diffstat (limited to 'data')
-rw-r--r--data/elementary/themes/edc/elm/label.edc19
1 files changed, 18 insertions, 1 deletions
diff --git a/data/elementary/themes/edc/elm/label.edc b/data/elementary/themes/edc/elm/label.edc
index b1e273bc09..99227d8067 100644
--- a/data/elementary/themes/edc/elm/label.edc
+++ b/data/elementary/themes/edc/elm/label.edc
@@ -25,9 +25,26 @@ group { name: "elm/label/base/default";
rel2.relative: 1.0 1.0;
text {
style: "label_style";
- min: 0 1;
+ min: 1 1;
}
}
+ description { state: "horizontal_fixed" 0.0;
+ inherit: "default" 0.0;
+ fixed: 1 0;
+ text.min: 0 1;
+ }
+ }
+ }
+ programs {
+ program { name: "horizontal_expandable";
+ signal: "elm,state,horizontal,expandable"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "elm.text";
+ }
+ program { name: "horizontal_fixed";
+ signal: "elm,state,horizontal,fixed"; source: "elm";
+ action: STATE_SET "horizontal_fixed" 0.0;
+ target: "elm.text";
}
}
}