dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Xavi Artigas 2018-06-29 11:28:57 -04:00 committed by Mike Blumenkrantz
parent 4d639df001
commit c35214ee9c
2 changed files with 60 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
data/elementary/themes/edc/elm/panel.edc
View File

@ -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";
}

6
src/lib/elementary/elm_panel.c
View File

@ -1366,12 +1366,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);