raster pushed a commit to branch feature/themes/flat.
http://git.enlightenment.org/core/efl.git/commit/?id=efb8fbcaef0caa638bbb83aab52e879a6fc325d3
commit efb8fbcaef0caa638bbb83aab52e879a6fc325d3
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Thu Sep 19 20:04:44 2019 +0100
TH - make noeffect/fast groups legacy
---
data/elementary/themes/edc/comp.edc | 190 ++---------------------------
data/elementary/themes/edc/comp_compat.edc | 141 ++-------------------
2 files changed, 18 insertions(+), 313 deletions(-)
diff --git a/data/elementary/themes/edc/comp.edc
b/data/elementary/themes/edc/comp.edc
index 58e785e909..65d98f1dd5 100644
--- a/data/elementary/themes/edc/comp.edc
+++ b/data/elementary/themes/edc/comp.edc
@@ -22,7 +22,7 @@ group { name: "e/comp/preview";
}
group { name: "e/comp/screen/base/default";
- alias: "e/comp/screen/base/noeffects";
+ alias: "e/comp/screen/base/noeffects"; // legacy
parts {
part { name: "clip"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
@@ -37,6 +37,7 @@ group { name: "e/comp/screen/base/default";
}
group { name: "e/comp/screen/overlay/default";
+ alias: "e/comp/screen/overlay/noeffects"; // legacy
images.image: "screen_circular_shadow.png" COMP;
parts {
part { name: "clip"; type: RECT; mouse_events: 0;
@@ -176,54 +177,8 @@ group { name: "e/comp/screen/overlay/default";
}
}
-
-group { name: "e/comp/screen/overlay/noeffects";
- inherit: "e/comp/screen/overlay/default";
- programs {
- program {
- name: "screensaver_on";
- transition: ACCELERATE 0 CURRENT;
- }
- program {
- name: "screensaver_on2";
- transition: DECELERATE 0 CURRENT;
- }
- program {
- name: "screensaver_off";
- transition: ACCELERATE 0 CURRENT;
- }
- program {
- name: "screensaver_off2";
- transition: ACCELERATE 0 CURRENT;
- }
- program {
- name: "suspend";
- transition: ACCELERATE 0 CURRENT;
- }
- program {
- name: "hibernate";
- transition: ACCELERATE 0 CURRENT;
- }
- program {
- name: "resume";
- transition: DECELERATE 0 CURRENT;
- }
- program {
- name: "reboot";
- transition: DECELERATE 0 CURRENT;
- }
- program {
- name: "halt";
- transition: DECELERATE 0 CURRENT;
- }
- program {
- name: "logout";
- transition: DECELERATE 0 CURRENT;
- }
- }
-}
-
group { name: "e/comp/frame/default";
+ alias: "e/comp/frame/default/fast"; // legacy
images.image: "win_shadow.png" COMP;
script {
public message(Msg_Type:type, id, ...) {
@@ -411,6 +366,7 @@ group { name: "e/comp/frame/default";
}
group { name: "e/comp/frame/rotate";
+ alias: "e/comp/frame/rotate/fast"; // legacy
inherit: "e/comp/frame/default";
parts {
part { name: "e.swallow.content";
@@ -451,19 +407,8 @@ group { name: "e/comp/frame/rotate";
}
}
-group { name: "e/comp/frame/rotate/fast";
- inherit: "e/comp/frame/rotate";
- programs {
- program { name: "focus3";
- transition: LINEAR 0;
- }
- program { name: "focus_off3";
- transition: LINEAR 0;
- }
- }
-}
-
group { name: "e/comp/frame/flip";
+ alias: "e/comp/frame/flip/fast"; // legacy
inherit: "e/comp/frame/rotate";
parts {
part { name: "e.swallow.content";
@@ -488,19 +433,8 @@ group { name: "e/comp/frame/flip";
}
}
-group { name: "e/comp/frame/flip/fast";
- inherit: "e/comp/frame/flip";
- programs {
- program { name: "focus3";
- transition: LINEAR 0;
- }
- program { name: "focus_off3";
- transition: LINEAR 0;
- }
- }
-}
-
group { name: "e/comp/frame/popup";
+ alias: "e/comp/frame/popup/fast"; // legacy
inherit: "e/comp/frame/default";
images.image: "win_shadow.png" COMP;
parts {
@@ -512,50 +446,6 @@ group { name: "e/comp/frame/popup";
}
}
-group { name: "e/comp/frame/default/fast";
- inherit: "e/comp/frame/default";
- programs {
- program {
- name: "visible_on";
- transition: DECELERATE 0;
- }
- program {
- name: "visible_off";
- transition: DECELERATE 0;
- }
-/*
- program {
- name: "focus_on";
- signal: "e,state,focus,on"; source: "e";
- action: STATE_SET "focused" 0.0;
- transition: SINUSOIDAL 0.1;
- targets: "glow" "focus-clipper";
- sequence {
- action: STATE_SET "default" 0.0;
- transition: SINUSOIDAL 0.1;
- target: "glow";
- }
- }
- program {
- name: "focus_off";
- transition: SINUSOIDAL 0;
- }
- */
- }
-}
-
-group { name: "e/comp/frame/popup/fast";
- inherit: "e/comp/frame/default/fast";
- images.image: "win_shadow.png" COMP;
- parts {
- part { name: "focus-clipper";
- description { state: "default";
- color_class: "";
- }
- }
- }
-}
-
group { name: "e/comp/frame/none";
parts {
part { name: "e.swallow.content"; type: SWALLOW;
@@ -576,6 +466,7 @@ group { name: "e/comp/frame/none";
}
group { name: "e/comp/frame/still";
+ alias: "e/comp/frame/still/fast"; // legacy
inherit: "e/comp/frame/default";
parts {
part { name: "shower";
@@ -587,19 +478,8 @@ group { name: "e/comp/frame/still";
}
}
-group { name: "e/comp/frame/still/fast";
- inherit: "e/comp/frame/default/fast";
- parts {
- part { name: "shower";
- description { state: "default" 0.0;
- rel1.relative: 0.0 0.0;
- rel2.relative: 1.0 1.0;
- }
- }
- }
-}
-
group { name: "e/comp/frame/menu";
+ alias: "e/comp/frame/menu/fast"; // legacy
inherit: "e/comp/frame/popup";
images.image: "win_menu_shadow.png" COMP;
parts {
@@ -617,19 +497,8 @@ group { name: "e/comp/frame/menu";
}
}
-group { name: "e/comp/frame/menu/fast";
- inherit: "e/comp/frame/popup/fast";
- parts {
- part { name: "shower";
- description { state: "default" 0.0;
- rel1.relative: 0.05 0.0;
- rel2.relative: 0.95 0.9;
- }
- }
- }
-}
-
group { name: "e/comp/frame/everything";
+ alias: "e/comp/frame/everything/fast"; // legacy
inherit: "e/comp/frame/popup";
parts {
part { name: "shadow";
@@ -646,19 +515,8 @@ group { name: "e/comp/frame/everything";
}
}
-group { name: "e/comp/frame/everything/fast";
- inherit: "e/comp/frame/popup/fast";
- parts {
- part { name: "shower";
- description { state: "default" 0.0;
- rel1.relative: -0.3 -0.3;
- rel2.relative: 1.3 1.3;
- }
- }
- }
-}
-
group { name: "e/comp/frame/fullscreen";
+ alias: "e/comp/frame/fullscreen/fast"; // legacy
images.image: "screen_circular_shadow.png" COMP;
data.item: "screen.bg" "fullscreen.bg";
parts {
@@ -812,31 +670,3 @@ group { name: "e/comp/frame/fullscreen";
}
}
}
-
-group { name: "e/comp/frame/fullscreen/fast";
- inherit: "e/comp/frame/fullscreen";
- programs {
- program {
- name: "visible_on";
- transition: DECELERATE 0;
- }
- program {
- name: "visible_on2";
- transition: DECELERATE 0;
- }
- program { name: "show2";
- transition: DECELERATE 0;
- }
- program {
- name: "visible_off";
- transition: DECELERATE 0;
- }
- program {
- name: "visible_off2";
- transition: DECELERATE 0;
- }
- program { name: "hide2";
- transition: DECELERATE 0;
- }
- }
-}
diff --git a/data/elementary/themes/edc/comp_compat.edc
b/data/elementary/themes/edc/comp_compat.edc
index 7d361f8382..f54854e0e7 100644
--- a/data/elementary/themes/edc/comp_compat.edc
+++ b/data/elementary/themes/edc/comp_compat.edc
@@ -1,4 +1,5 @@
group { name: "e/comp/border/default";
+ alias: "e/comp/border/default/fast"; // legacy
images.image: "win_shadow.png" COMP;
parts {
part { name: "clipper"; type: RECT;
@@ -160,6 +161,7 @@ group { name: "e/comp/border/default";
}
group { name: "e/comp/border/rotate";
+ alias: "e/comp/border/rotate/fast"; // legacy
inherit: "e/comp/border/default";
parts {
part { name: "e.swallow.content";
@@ -200,19 +202,8 @@ group { name: "e/comp/border/rotate";
}
}
-group { name: "e/comp/border/rotate/fast";
- inherit: "e/comp/border/rotate";
- programs {
- program { name: "focus3";
- transition: LINEAR 0;
- }
- program { name: "focus_off3";
- transition: LINEAR 0;
- }
- }
-}
-
group { name: "e/comp/border/flip";
+ alias: "e/comp/border/flip/fast"; // legacy
inherit: "e/comp/border/rotate";
parts {
part { name: "e.swallow.content";
@@ -237,19 +228,8 @@ group { name: "e/comp/border/flip";
}
}
-group { name: "e/comp/border/flip/fast";
- inherit: "e/comp/border/flip";
- programs {
- program { name: "focus3";
- transition: LINEAR 0;
- }
- program { name: "focus_off3";
- transition: LINEAR 0;
- }
- }
-}
-
group { name: "e/comp/border/popup";
+ alias: "e/comp/border/popup/fast"; // legacy
inherit: "e/comp/border/default";
parts {
part { name: "focus-clipper";
@@ -260,51 +240,6 @@ group { name: "e/comp/border/popup";
}
}
-group { name: "e/comp/border/default/fast";
- inherit: "e/comp/border/default";
- programs {
- program {
- name: "visible_on";
- transition: DECELERATE 0;
- }
- program {
- name: "visible_off";
- transition: DECELERATE 0;
- }
-/*
- program {
- name: "focus_on";
- signal: "e,state,focus,on"; source: "e";
- action: STATE_SET "focused" 0.0;
- transition: SINUSOIDAL 0.1;
- target: "glow";
- target: "focus-clipper";
- after: "focus2";
- }
- program { name: "focus2";
- action: STATE_SET "default" 0.0;
- transition: SINUSOIDAL 0.1;
- target: "glow";
- }
- program {
- name: "focus_off";
- transition: SINUSOIDAL 0;
- }
- */
- }
-}
-
-group { name: "e/comp/border/popup/fast";
- inherit: "e/comp/border/default/fast";
- parts {
- part { name: "focus-clipper";
- description { state: "default";
- color_class: "";
- }
- }
- }
-}
-
group { name: "e/comp/border/none";
parts {
part { name: "e.swallow.content"; type: SWALLOW;
@@ -325,6 +260,7 @@ group { name: "e/comp/border/none";
}
group { name: "e/comp/border/still";
+ alias: "e/comp/border/still/fast"; // legacy
inherit: "e/comp/border/default";
parts {
part { name: "shower";
@@ -336,19 +272,8 @@ group { name: "e/comp/border/still";
}
}
-group { name: "e/comp/border/still/fast";
- inherit: "e/comp/border/default/fast";
- parts {
- part { name: "shower";
- description { state: "default" 0.0;
- rel1.relative: 0.0 0.0;
- rel2.relative: 1.0 1.0;
- }
- }
- }
-}
-
group { name: "e/comp/border/menu";
+ alias: "e/comp/border/menu/fast"; // legacy
inherit: "e/comp/border/popup";
parts {
part { name: "shower";
@@ -360,19 +285,8 @@ group { name: "e/comp/border/menu";
}
}
-group { name: "e/comp/border/menu/fast";
- inherit: "e/comp/border/popup/fast";
- parts {
- part { name: "shower";
- description { state: "default" 0.0;
- rel1.relative: 0.05 0.0;
- rel2.relative: 0.95 0.9;
- }
- }
- }
-}
-
group { name: "e/comp/border/everything";
+ alias: "e/comp/border/everything/fast"; // legacy
inherit: "e/comp/border/popup";
parts {
part { name: "shower";
@@ -384,19 +298,8 @@ group { name: "e/comp/border/everything";
}
}
-group { name: "e/comp/border/everything/fast";
- inherit: "e/comp/border/popup/fast";
- parts {
- part { name: "shower";
- description { state: "default" 0.0;
- rel1.relative: -0.3 -0.3;
- rel2.relative: 1.3 1.3;
- }
- }
- }
-}
-
group { name: "e/comp/border/fullscreen";
+ alias: "e/comp/border/fullscreen/fast"; // legacy
images.image: "screen_circular_shadow.png" COMP;
data.item: "screen.bg" "fullscreen.bg";
parts {
@@ -558,31 +461,3 @@ group { name: "e/comp/border/fullscreen";
}
}
}
-
-group { name: "e/comp/border/fullscreen/fast";
- inherit: "e/comp/border/fullscreen";
- programs {
- program {
- name: "visible_on";
- transition: DECELERATE 0;
- }
- program {
- name: "visible_on2";
- transition: DECELERATE 0;
- }
- program { name: "show2";
- transition: DECELERATE 0;
- }
- program {
- name: "visible_off";
- transition: DECELERATE 0;
- }
- program {
- name: "visible_off2";
- transition: DECELERATE 0;
- }
- program { name: "hide2";
- transition: DECELERATE 0;
- }
- }
-}
--
