From 1d582ce945be72fdda34954b1714387089e50e60 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Thu, 10 Sep 2020 17:01:38 +0100 Subject: [PATCH] TH - ctxpopup --- data/elementary/themes/edc/elm/ctxpopup.edc | 164 +++++++++----------- 1 file changed, 72 insertions(+), 92 deletions(-) diff --git a/data/elementary/themes/edc/elm/ctxpopup.edc b/data/elementary/themes/edc/elm/ctxpopup.edc index 2307835dc2..eb9fdc7297 100644 --- a/data/elementary/themes/edc/elm/ctxpopup.edc +++ b/data/elementary/themes/edc/elm/ctxpopup.edc @@ -17,61 +17,55 @@ group { name: "elm/ctxpopup/bg/default"; } description { state: "visible" 0.0; inherit: "default" 0.0; - color: 0 0 0 192; + color: 0 0 0 64; } } } programs { - program { - signal: "mouse,clicked,*"; source: "base"; + program { signal: "mouse,clicked,*"; source: "base"; action: SIGNAL_EMIT "elm,action,click" "elm"; } - program { - signal: "elm,state,show"; source: "elm"; + program { signal: "elm,state,show"; source: "elm"; action: STATE_SET "visible" 0.0; - transition: LINEAR 0.2; + transition: SINUSOIDAL 0.3; target: "base"; } - program { - signal: "elm,state,hide"; source: "elm"; + program { signal: "elm,state,hide"; source: "elm"; action: STATE_SET "default" 0.0; - transition: LINEAR 0.3; + transition: SINUSOIDAL 0.5; target: "base"; } } } group { name: "elm/ctxpopup/base/default"; - images.image: "tooltip-base.png" COMP; parts { - part { name: "base"; + part { name: "base"; type: RECT; clip_to: "clip"; description { state: "default" 0.0; - image.normal: "tooltip-base.png"; - image.border: 7 7 6 8; - image.middle: SOLID; - color_class: "ctxpopup_bg"; + color: 0 0 0 192; } } part { name: "elm.swallow.background"; type: SWALLOW; clip_to: "clip"; description { state: "default" 0.0; fixed: 1 1; - rel1.to: "base"; - rel2.to: "base"; + rel.to: "base"; } } part { name: "elm.swallow.content"; type: SWALLOW; clip_to: "clip"; + scale: 1; description { state: "default" 0.0; - rel1 { to:"base"; offset: 8 6; } - rel2 { to:"base"; offset: -7 -8; } + rel.to: "base"; + rel1.offset: 8 8; + rel2.offset: -9 -9; + offscale; } } part { name: "event"; type: RECT; description { state: "default" 0.0; color: 0 0 0 0; - visible: 1; } description { state: "visible" 0.0; inherit: "default" 0.0; @@ -82,8 +76,9 @@ group { name: "elm/ctxpopup/base/default"; description { state: "default" 0.0; color: 255 255 255 0; visible: 0; - rel1.offset: -20 -20; - rel2.offset: 19 19; + rel1.offset: -200 -200; + rel2.offset: 199 199; + fixed: 1 1; } description { state: "visible" 0.0; inherit: "default" 0.0; @@ -91,113 +86,117 @@ group { name: "elm/ctxpopup/base/default"; visible: 1; } } - - // 9x13 + part { name: "arrow_area_left"; type: SPACER; + scale : 1; description { state: "default" 0.0; - min: 9 13; + min: 15 15; fixed: 1 0; - align: 1.0 0.5; - rel1.to: "base"; - rel1.offset: 2 5; - rel2.to: "base"; - rel2.offset: 2 -6; + align: 0.75 0.5; + rel.to: "base"; + rel1.offset: -5 0; + rel2.offset: -5 -1; rel2.relative: 0.0 1.0; + offscale; } } part { name: "elm.swallow.arrow_left"; type: SWALLOW; mouse_events: 0; + scale : 1; clip_to: "clip"; dragable.x: 1 1 0; dragable.y: 1 1 0; dragable.confine: "arrow_area_left"; description { state: "default" 0.0; - min: 9 13; + min: 15 15; fixed: 1 1; } } part { name: "arrow_area_right"; type: SPACER; + scale : 1; description { state: "default" 0.0; - min: 9 13; + min: 15 15; fixed: 1 0; - align: 0.0 0.5; - rel1.to: "base"; - rel1.offset: -3 5; + align: 0.25 0.5; + rel.to: "base"; + rel1.offset: 4 0; rel1.relative: 1.0 0.0; - rel2.to: "base"; - rel2.offset: -3 -6; + rel2.offset: 4 -1; + offscale; } } part { name: "elm.swallow.arrow_right"; type: SWALLOW; mouse_events: 0; + scale : 1; clip_to: "clip"; dragable.x: 1 1 0; dragable.y: 1 1 0; dragable.confine: "arrow_area_right"; description { state: "default" 0.0; - min: 9 13; + min: 15 15; fixed: 1 1; } } - - // 11x9 + part { name: "arrow_area_up"; type: SPACER; + scale : 1; description { state: "default" 0.0; - min: 11 9; + min: 15 15; fixed: 1 1; - align: 0.5 1; - rel1.to: "base"; - rel1.offset: 5 3; - rel2.to: "base"; - rel2.offset: -6 3; + align: 0.5 0.75; + rel.to: "base"; + rel1.offset: 0 -5; + rel2.offset: -1 -5; rel2.relative: 1.0 0.0; + offscale; } } part { name: "elm.swallow.arrow_up"; type: SWALLOW; mouse_events: 0; + scale : 1; clip_to: "clip"; dragable.x: 1 1 0; dragable.y: 1 1 0; dragable.confine: "arrow_area_up"; description { state: "default" 0.0; - min: 11 9; + min: 15 15; fixed: 1 1; } } - + part { name: "arrow_area_down"; type: SPACER; + scale : 1; description { state: "default" 0.0; - min: 11 9; + min: 15 15; fixed: 1 1; - align: 0.5 0.0; - rel1.to: "base"; - rel1.offset: 5 -4; + align: 0.5 0.25; + rel.to: "base"; + rel1.offset: 0 4; rel1.relative: 0.0 1.0; - rel2.to: "base"; - rel2.offset: -6 -4; + rel2.offset: -1 4; + offscale; } } part { name: "elm.swallow.arrow_down"; type: SWALLOW; mouse_events: 0; + scale : 1; clip_to: "clip"; dragable.x: 1 1 0; dragable.y: 1 1 0; dragable.confine: "arrow_area_down"; description { state: "default" 0.0; - min: 11 9; + min: 15 15; fixed: 1 1; } } } programs { - program { - signal: "elm,state,show"; source: "elm"; + program { signal: "elm,state,show"; source: "elm"; action: STATE_SET "visible" 0.0; - transition: LINEAR 0.2; + transition: SINUSOIDAL 0.1; target: "clip"; target: "event"; } - program { - signal: "elm,state,hide"; source: "elm"; + program { signal: "elm,state,hide"; source: "elm"; action: STATE_SET "default" 0.0; - transition: LINEAR 0.3; + transition: SINUSOIDAL 0.3; target: "clip"; target: "event"; after: "hide2"; @@ -210,66 +209,47 @@ group { name: "elm/ctxpopup/base/default"; } group { name: "elm/ctxpopup/arrow/default"; - images.image: "tooltip-edge-left-tip.png" COMP; - images.image: "tooltip-edge-right-tip.png" COMP; - images.image: "tooltip-edge-bottom-tip.png" COMP; - images.image: "tooltip-edge-top-tip.png" COMP; parts { part { name: "base"; + scale: 1; description { state: "default" 0.0; - min: 9 9; + min: 15 15; fixed: 1 1; - image.normal: "tooltip-edge-left-tip.png"; - color_class: "ctxpopup_bg"; + image.normal: "i-arrow-l"; + color: 255 255 255 255; } description { state: "left" 0.0; inherit: "default" 0.0; - min: 9 13; - align: 0.0 0.5; - image.normal: "tooltip-edge-left-tip.png"; - color_class: "ctxpopup_bg"; + image.normal: "i-arrow-l"; } description { state: "right" 0.0; inherit: "default" 0.0; - min: 9 13; - align: 1.0 0.5; - image.normal: "tooltip-edge-right-tip.png"; - color_class: "ctxpopup_bg"; + image.normal: "i-arrow-r"; } description { state: "top" 0.0; inherit: "default" 0.0; - min: 11 9; - align: 0.5 0.0; - image.normal: "tooltip-edge-top-tip.png"; - color_class: "ctxpopup_bg"; + image.normal: "i-arrow-u"; } description { state: "bottom" 0.0; inherit: "default" 0.0; - min: 11 9; - align: 0.5 1.0; - image.normal: "tooltip-edge-bottom-tip.png"; - color_class: "ctxpopup_bg"; + image.normal: "i-arrow-d"; } } } programs { - program { - signal: "elm,state,left"; source: "elm"; + program { signal: "elm,state,left"; source: "elm"; action: STATE_SET "left" 0.0; target: "base"; } - program { - signal: "elm,state,right"; source: "elm"; + program { signal: "elm,state,right"; source: "elm"; action: STATE_SET "right" 0.0; target: "base"; } - program { - signal: "elm,state,top"; source: "elm"; + program { signal: "elm,state,top"; source: "elm"; action: STATE_SET "top" 0.0; target: "base"; } - program { - signal: "elm,state,bottom"; source: "elm"; + program { signal: "elm,state,bottom"; source: "elm"; action: STATE_SET "bottom" 0.0; target: "base"; }