From c146fb2b958bbe050953a272491295647f05adf2 Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Thu, 26 Jul 2012 20:50:34 +0000 Subject: [PATCH] naviframe: always keep title centered if there is a button, consider the same amount on the other side, even if there is no button in there, limited to the maximum button size (100px). It's not optimal, but looks less ugly. SVN revision: 74451 --- .../data/themes/widgets/naviframe.edc | 69 ++++--------------- 1 file changed, 15 insertions(+), 54 deletions(-) diff --git a/legacy/elementary/data/themes/widgets/naviframe.edc b/legacy/elementary/data/themes/widgets/naviframe.edc index a3ab2a652e..d5b2608671 100644 --- a/legacy/elementary/data/themes/widgets/naviframe.edc +++ b/legacy/elementary/data/themes/widgets/naviframe.edc @@ -155,46 +155,26 @@ group { name: "elm/naviframe/item/basic/default"; color: 0 0 0 0; fixed: 1 1; rel1 { - to_y: "title_clip"; - to_x: "elm.swallow.prev_btn"; - relative: 1.0 0.0; - offset: 10 0; + to: "title_clip"; + relative: 0.0 0.0; + offset: 100 0; } rel2 { to: "title_clip"; - to_x: "elm.swallow.next_btn"; - relative: 0.0 1.0; - offset: -11 -1; + relative: 1.0 1.0; + offset: -101 -1; } } description { state: "full" 0.0; inherit: "default" 0.0; - rel1 { - to: "title_clip"; - relative: 0.0 0.0; - offset: 0 0; - } - rel2 { - to: "title_clip"; - relative: 1.0 1.0; - offset: -1 -1; - } + rel1.offset: 0 0; + rel2.offset: -1 -1; } description { state: "no-prev" 0.0; inherit: "default" 0.0; - rel1 { - to: "title_clip"; - relative: 0.0 0.0; - offset: 0 0; - } } description { state: "no-next" 0.0; inherit: "default" 0.0; - rel2 { - to: "title_clip"; - relative: 1.0 1.0; - offset: -1 -1; - } } } part { name: "elm.swallow.prev_btn"; @@ -615,50 +595,31 @@ group { name: "elm/naviframe/item/overlap/default"; part { name: "elements_area"; type: RECT; mouse_events: 0; + clip_to: "title_clip"; description { state: "default" 0.0; color: 0 0 0 0; fixed: 1 1; rel1 { - to_y: "title_clip"; - to_x: "elm.swallow.prev_btn"; - relative: 1.0 0.0; - offset: 10 0; + to: "title_clip"; + relative: 0.0 0.0; + offset: 100 0; } rel2 { to: "title_clip"; - to_x: "elm.swallow.next_btn"; - relative: 0.0 1.0; - offset: -11 -1; + relative: 1.0 1.0; + offset: -101 -1; } } description { state: "full" 0.0; inherit: "default" 0.0; - rel1 { - to: "title_clip"; - relative: 0.0 0.0; - offset: 0 0; - } - rel2 { - to: "title_clip"; - relative: 1.0 1.0; - offset: -1 -1; - } + rel1.offset: 0 0; + rel2.offset: -1 -1; } description { state: "no-prev" 0.0; inherit: "default" 0.0; - rel1 { - to: "title_clip"; - relative: 0.0 0.0; - offset: 0 0; - } } description { state: "no-next" 0.0; inherit: "default" 0.0; - rel2 { - to: "title_clip"; - relative: 1.0 1.0; - offset: -1 -1; - } } } part { name: "elm.swallow.prev_btn";