From 380a53df76c515431c96e7eb7bead67bac6fcb50 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sat, 14 Jan 2012 02:29:29 +0000 Subject: [PATCH] use minmuml for frame hide/show. SVN revision: 67198 --- .../elementary/data/themes/widgets/frame.edc | 41 ++++++++----------- legacy/elementary/src/lib/elm_frame.c | 1 - 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/legacy/elementary/data/themes/widgets/frame.edc b/legacy/elementary/data/themes/widgets/frame.edc index 946ecf8c5f..f02efe7022 100644 --- a/legacy/elementary/data/themes/widgets/frame.edc +++ b/legacy/elementary/data/themes/widgets/frame.edc @@ -32,11 +32,6 @@ group { name: "elm/frame/base/default"; } fill.smooth : 0; } - description { state: "collapsed" 0.0; - inherit: "default" 0.0; - rel2.to_y: "elm.text"; - rel2.offset: 9 0; - } } part { name: "elm.text"; type: TEXT; @@ -97,15 +92,15 @@ group { name: "elm/frame/base/default"; description { state: "default" 0.0; align: 0.0 1.0; rel1 { - to: "clip"; - relative: 0.0 0.0; + to_y: "elm.text"; + relative: 0.0 1.0; + offset: 8 2; } - rel2.to: "clip"; + rel2.offset: -9 -9; } description { state: "collapsed" 0.0; inherit: "default" 0.0; -// rel1.relative: 0.0 1.0; - rel1.offset: 0 -100; + minmul: 1.0 0.0; } } part { name: "event"; @@ -120,6 +115,18 @@ group { name: "elm/frame/base/default"; } } programs { + program { name: "collapse"; + action: STATE_SET "collapsed" 0.0; + target: "elm.swallow.content"; + transition: BOUNCE 0.5 1.0 3; + after: "signal"; + } + program { name: "expand"; + action: STATE_SET "default" 0.0; + target: "elm.swallow.content"; + transition: BOUNCE 0.5 1.0 3; + after: "signal"; + } program { name: "click"; signal: "mouse,up,1"; source: "event"; @@ -131,25 +138,13 @@ group { name: "elm/frame/base/default"; script { new st[31]; new Float:vl; - get_state(PART:"over", st, 30, vl); + get_state(PART:"elm.swallow.content", st, 30, vl); if (!strcmp(st, "default")) run_program(PROGRAM:"collapse"); else run_program(PROGRAM:"expand"); } } - program { name: "collapse"; - action: STATE_SET "collapsed" 0.0; - target: "elm.swallow.content"; - transition: LINEAR 1.0; - after: "signal"; - } - program { name: "expand"; - action: STATE_SET "default" 0.0; - target: "elm.swallow.content"; - transition: LINEAR 1.0; - after: "signal"; - } program { name: "signal"; action: SIGNAL_EMIT "elm,anim,done" "elm"; } diff --git a/legacy/elementary/src/lib/elm_frame.c b/legacy/elementary/src/lib/elm_frame.c index fafd25be43..ae99aa9ea9 100644 --- a/legacy/elementary/src/lib/elm_frame.c +++ b/legacy/elementary/src/lib/elm_frame.c @@ -86,7 +86,6 @@ _sizing_eval(Evas_Object *obj) edje_object_size_min_calc(wd->frm, &minw, &minh); evas_object_size_hint_min_get(obj, &cminw, &cminh); if ((minw == cminw) && (minh == cminh)) return; - //printf("min: %3.3f %ix%i\n", ecore_loop_time_get(), minw, minh); evas_object_size_hint_min_set(obj, minw, minh); evas_object_size_hint_max_set(obj, -1, -1); }