From 4961954ee52845ee647a49da07e4e2a324712274 Mon Sep 17 00:00:00 2001 From: Xavi Artigas Date: Fri, 29 Jun 2018 11:28:57 -0400 Subject: [PATCH] default theme: fix part names in elm/scrollable/panel Summary: Ref T6966 Depends on D6455 Reviewers: zmike, devilhorns Reviewed By: zmike Subscribers: cedric, #committers Tags: #efl Maniphest Tasks: T6966 Differential Revision: https://phab.enlightenment.org/D6456 --- data/elementary/themes/edc/elm/panel.edc | 112 +++++++++++++++---------------- src/lib/elementary/elm_panel.c | 6 +- 2 files changed, 60 insertions(+), 58 deletions(-) diff --git a/data/elementary/themes/edc/elm/panel.edc b/data/elementary/themes/edc/elm/panel.edc index ad3bb5e..02dbdad 100644 --- a/data/elementary/themes/edc/elm/panel.edc +++ b/data/elementary/themes/edc/elm/panel.edc @@ -13,7 +13,7 @@ group { name: "elm/scroller/panel/default"; group { name: "elm/scroller/panel/left/default"; parts { - part { name: "panel_area"; + part { name: "elm.panel_area"; type: SWALLOW; description { state: "default" 0.0; rel2.relative: 0.0 1.0; @@ -26,16 +26,16 @@ group { name: "elm/scroller/panel/left/default"; visible: 1; } } - part { name: "event_area"; + part { name: "elm.event_area"; type: SWALLOW; description { state: "default" 0.0; rel1 { relative: 1.0 0.0; - to: "panel_area"; + to: "elm.panel_area"; } rel2 { relative: 1.0 1.0; - to: "panel_area"; + to: "elm.panel_area"; } align: 0.0 0.5; fixed: 1 1; @@ -50,16 +50,16 @@ group { name: "elm/scroller/panel/left/default"; type: RECT; repeat_events: 1; description { state: "default" 0.0; - rel1.to: "panel_area"; - rel2.to: "panel_area"; + rel1.to: "elm.panel_area"; + rel2.to: "elm.panel_area"; color: 0 0 0 0; } } part { name: "bg"; type: RECT; description { state: "default" 0.0; - rel1.to: "panel_area"; - rel2.to: "panel_area"; + rel1.to: "elm.panel_area"; + rel2.to: "elm.panel_area"; color: 64 64 64 255; visible: 0; } @@ -71,8 +71,8 @@ group { name: "elm/scroller/panel/left/default"; part { name: "elm.swallow.content"; type: SWALLOW; description { state: "default" 0.0; - rel1.to: "panel_area"; - rel2.to: "panel_area"; + rel1.to: "elm.panel_area"; + rel2.to: "elm.panel_area"; visible: 0; } description { state: "visible" 0.0; @@ -86,8 +86,8 @@ group { name: "elm/scroller/panel/left/default"; signal: "elm,state,content,visible"; source: "elm"; action: STATE_SET "visible" 0.0; - target: "panel_area"; - target: "event_area"; + target: "elm.panel_area"; + target: "elm.event_area"; target: "bg"; target: "elm.swallow.content"; } @@ -95,8 +95,8 @@ group { name: "elm/scroller/panel/left/default"; signal: "elm,state,content,hidden"; source: "elm"; action: STATE_SET "default" 0.0; - target: "panel_area"; - target: "event_area"; + target: "elm.panel_area"; + target: "elm.event_area"; target: "bg"; target: "elm.swallow.content"; } @@ -105,7 +105,7 @@ group { name: "elm/scroller/panel/left/default"; group { name: "elm/scroller/panel/right/default"; parts { - part { name: "event_area"; + part { name: "elm.event_area"; type: SWALLOW; description { state: "default" 0.0; rel2.relative: 0.0 1.0; @@ -118,16 +118,16 @@ group { name: "elm/scroller/panel/right/default"; visible: 1; } } - part { name: "panel_area"; + part { name: "elm.panel_area"; type: SWALLOW; description { state: "default" 0.0; rel1 { relative: 1.0 0.0; - to: "event_area"; + to: "elm.event_area"; } rel2 { relative: 1.0 1.0; - to: "event_area"; + to: "elm.event_area"; } align: 0.0 0.5; fixed: 1 1; @@ -142,16 +142,16 @@ group { name: "elm/scroller/panel/right/default"; type: RECT; repeat_events: 1; description { state: "default" 0.0; - rel1.to: "panel_area"; - rel2.to: "panel_area"; + rel1.to: "elm.panel_area"; + rel2.to: "elm.panel_area"; color: 0 0 0 0; } } part { name: "bg"; type: RECT; description { state: "default" 0.0; - rel1.to: "panel_area"; - rel2.to: "panel_area"; + rel1.to: "elm.panel_area"; + rel2.to: "elm.panel_area"; color: 64 64 64 255; visible: 0; } @@ -163,8 +163,8 @@ group { name: "elm/scroller/panel/right/default"; part { name: "elm.swallow.content"; type: SWALLOW; description { state: "default" 0.0; - rel1.to: "panel_area"; - rel2.to: "panel_area"; + rel1.to: "elm.panel_area"; + rel2.to: "elm.panel_area"; visible: 0; } description { state: "visible" 0.0; @@ -178,8 +178,8 @@ group { name: "elm/scroller/panel/right/default"; signal: "elm,state,content,visible"; source: "elm"; action: STATE_SET "visible" 0.0; - target: "panel_area"; - target: "event_area"; + target: "elm.panel_area"; + target: "elm.event_area"; target: "bg"; target: "elm.swallow.content"; } @@ -187,8 +187,8 @@ group { name: "elm/scroller/panel/right/default"; signal: "elm,state,content,hidden"; source: "elm"; action: STATE_SET "default" 0.0; - target: "panel_area"; - target: "event_area"; + target: "elm.panel_area"; + target: "elm.event_area"; target: "bg"; target: "elm.swallow.content"; } @@ -197,7 +197,7 @@ group { name: "elm/scroller/panel/right/default"; group { name: "elm/scroller/panel/top/default"; parts { - part { name: "panel_area"; + part { name: "elm.panel_area"; type: SWALLOW; description { state: "default" 0.0; rel2.relative: 1.0 0.0; @@ -210,16 +210,16 @@ group { name: "elm/scroller/panel/top/default"; visible: 1; } } - part { name: "event_area"; + part { name: "elm.event_area"; type: SWALLOW; description { state: "default" 0.0; rel1 { relative: 0.0 1.0; - to: "panel_area"; + to: "elm.panel_area"; } rel2 { relative: 1.0 1.0; - to: "panel_area"; + to: "elm.panel_area"; } align: 0.5 0.0; fixed: 1 1; @@ -234,16 +234,16 @@ group { name: "elm/scroller/panel/top/default"; type: RECT; repeat_events: 1; description { state: "default" 0.0; - rel1.to: "panel_area"; - rel2.to: "panel_area"; + rel1.to: "elm.panel_area"; + rel2.to: "elm.panel_area"; color: 0 0 0 0; } } part { name: "bg"; type: RECT; description { state: "default" 0.0; - rel1.to: "panel_area"; - rel2.to: "panel_area"; + rel1.to: "elm.panel_area"; + rel2.to: "elm.panel_area"; color: 64 64 64 255; visible: 0; } @@ -255,8 +255,8 @@ group { name: "elm/scroller/panel/top/default"; part { name: "elm.swallow.content"; type: SWALLOW; description { state: "default" 0.0; - rel1.to: "panel_area"; - rel2.to: "panel_area"; + rel1.to: "elm.panel_area"; + rel2.to: "elm.panel_area"; visible: 0; } description { state: "visible" 0.0; @@ -270,8 +270,8 @@ group { name: "elm/scroller/panel/top/default"; signal: "elm,state,content,visible"; source: "elm"; action: STATE_SET "visible" 0.0; - target: "panel_area"; - target: "event_area"; + target: "elm.panel_area"; + target: "elm.event_area"; target: "bg"; target: "elm.swallow.content"; } @@ -279,8 +279,8 @@ group { name: "elm/scroller/panel/top/default"; signal: "elm,state,content,hidden"; source: "elm"; action: STATE_SET "default" 0.0; - target: "panel_area"; - target: "event_area"; + target: "elm.panel_area"; + target: "elm.event_area"; target: "bg"; target: "elm.swallow.content"; } @@ -289,7 +289,7 @@ group { name: "elm/scroller/panel/top/default"; group { name: "elm/scroller/panel/bottom/default"; parts { - part { name: "event_area"; + part { name: "elm.event_area"; type: SWALLOW; description { state: "default" 0.0; rel2.relative: 1.0 0.0; @@ -302,16 +302,16 @@ group { name: "elm/scroller/panel/bottom/default"; visible: 1; } } - part { name: "panel_area"; + part { name: "elm.panel_area"; type: SWALLOW; description { state: "default" 0.0; rel1 { relative: 0.0 1.0; - to: "event_area"; + to: "elm.event_area"; } rel2 { relative: 1.0 1.0; - to: "event_area"; + to: "elm.event_area"; } align: 0.5 0.0; fixed: 1 1; @@ -326,16 +326,16 @@ group { name: "elm/scroller/panel/bottom/default"; type: RECT; repeat_events: 1; description { state: "default" 0.0; - rel1.to: "panel_area"; - rel2.to: "panel_area"; + rel1.to: "elm.panel_area"; + rel2.to: "elm.panel_area"; color: 0 0 0 0; } } part { name: "bg"; type: RECT; description { state: "default" 0.0; - rel1.to: "panel_area"; - rel2.to: "panel_area"; + rel1.to: "elm.panel_area"; + rel2.to: "elm.panel_area"; color: 64 64 64 255; visible: 0; } @@ -347,8 +347,8 @@ group { name: "elm/scroller/panel/bottom/default"; part { name: "elm.swallow.content"; type: SWALLOW; description { state: "default" 0.0; - rel1.to: "panel_area"; - rel2.to: "panel_area"; + rel1.to: "elm.panel_area"; + rel2.to: "elm.panel_area"; visible: 0; } description { state: "visible" 0.0; @@ -362,8 +362,8 @@ group { name: "elm/scroller/panel/bottom/default"; signal: "elm,state,content,visible"; source: "elm"; action: STATE_SET "visible" 0.0; - target: "panel_area"; - target: "event_area"; + target: "elm.panel_area"; + target: "elm.event_area"; target: "bg"; target: "elm.swallow.content"; } @@ -371,8 +371,8 @@ group { name: "elm/scroller/panel/bottom/default"; signal: "elm,state,content,hidden"; source: "elm"; action: STATE_SET "default" 0.0; - target: "panel_area"; - target: "event_area"; + target: "elm.panel_area"; + target: "elm.event_area"; target: "bg"; target: "elm.swallow.content"; } diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c index 8ab0180..f73c82c 100644 --- a/src/lib/elementary/elm_panel.c +++ b/src/lib/elementary/elm_panel.c @@ -1468,12 +1468,14 @@ _elm_panel_scrollable_set(Eo *obj, Elm_Panel_Data *sd, Eina_Bool scrollable) sd->scr_panel = evas_object_rectangle_add(evas_object_evas_get(obj)); evas_object_color_set(sd->scr_panel, 0, 0, 0, 0); elm_widget_sub_object_add(obj, sd->scr_panel); - elm_layout_content_set(sd->scr_ly, "panel_area", sd->scr_panel); + if (!elm_layout_content_set(sd->scr_ly, "elm.panel_area", sd->scr_panel)) + elm_layout_content_set(sd->scr_ly, "panel_area", sd->scr_panel); sd->scr_event = evas_object_rectangle_add(evas_object_evas_get(obj)); evas_object_color_set(sd->scr_event, 0, 0, 0, 0); elm_widget_sub_object_add(obj, sd->scr_event); - elm_layout_content_set(sd->scr_ly, "event_area", sd->scr_event); + if (!elm_layout_content_set(sd->scr_ly, "elm.event_area", sd->scr_event)) + elm_layout_content_set(sd->scr_ly, "event_area", sd->scr_event); } elm_interface_scrollable_content_set(obj, sd->scr_ly); -- 2.7.4