raster pushed a commit to branch master.
http://git.enlightenment.org/themes/dark.git/commit/?id=2a3c567ae1b0d4a065e66a06f86cb0c9174945e3
commit 2a3c567ae1b0d4a065e66a06f86cb0c9174945e3
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Wed Oct 16 21:31:04 2013 +0900
contextpopup and tooltip fix. done.
---
edje/dark.edc | 1 -
edje/edc/elm/ctxpopup.edc | 481 ++++++++++++++--------------------------------
edje/edc/elm/tooltip.edc | 133 +++++--------
3 files changed, 199 insertions(+), 416 deletions(-)
diff --git a/edje/dark.edc b/edje/dark.edc
index b307254..f16965a 100644
--- a/edje/dark.edc
+++ b/edje/dark.edc
@@ -39,7 +39,6 @@ collections {
#include "edc/elm/inwin.edc"
#include "edc/elm/slideshow.edc"
#include "edc/elm/diskselector.edc"
-// XXX: fix gfx (ctxpopup) - use bubble look used for tooltips, bubble etc.
#include "edc/elm/ctxpopup.edc"
#include "edc/elm/multibuttonentry.edc"
#include "edc/elm/dayselector.edc"
diff --git a/edje/edc/elm/ctxpopup.edc b/edje/edc/elm/ctxpopup.edc
index 5df13e8..d244398 100644
--- a/edje/edc/elm/ctxpopup.edc
+++ b/edje/edc/elm/ctxpopup.edc
@@ -1,367 +1,199 @@
///////////////////////////////////////////////////////////////////////////////
group { name: "elm/ctxpopup/bg/noblock";
parts {
- part { name: "ctxpopup_bg";
- type: RECT;
- mouse_events: 0;
+ part { name: "base"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
color: 0 0 0 0;
}
}
}
}
+
group { name: "elm/ctxpopup/bg/default";
parts {
- part { name: "ctxpopup_bg";
- type: RECT;
- mouse_events: 1;
+ part { name: "base"; type: RECT;
description { state: "default" 0.0;
color: 0 0 0 0;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
- color: 0 0 0 100;
+ color: 0 0 0 192;
}
}
}
programs {
- program { name: "clicked_event";
- signal: "mouse,clicked,1";
- source: "ctxpopup_bg";
+ program {
+ signal: "mouse,clicked,1"; source: "base";
action: SIGNAL_EMIT "elm,action,click" "elm";
}
- program { name: "show";
- signal: "elm,state,show";
- source: "elm";
+ program {
+ signal: "elm,state,show"; source: "elm";
action: STATE_SET "visible" 0.0;
- target: "ctxpopup_bg";
- transition: LINEAR 0.25;
+ transition: LINEAR 0.2;
+ target: "base";
}
- program { name: "hide";
- signal: "elm,state,hide";
- source: "elm";
+ program {
+ signal: "elm,state,hide"; source: "elm";
action: STATE_SET "default" 0.0;
- target: "ctxpopup_bg";
- transition: LINEAR 0.25;
+ transition: LINEAR 0.3;
+ target: "base";
}
}
}
group { name: "elm/ctxpopup/base/default";
- images {
- image: "vgrad_med_darker.png" COMP;
- image: "led_square_shading.png" COMP;
- image: "led_square_shadow.png" COMP;
- }
+ images.image: "tooltip-base.png" COMP;
parts {
- part { name: "arrow_area_left";
- type: RECT;
- mouse_events: 0;
- clip_to: "ctxpopup_clip";
+ part { name: "base";
+ clip_to: "clip";
description { state: "default" 0.0;
- visible: 0;
- min: 20 0;
- fixed: 1 0;
- align: 1 0.5;
- rel1 {
- to_y: "base";
- }
- rel2 {
- relative:0 1;
- to:"base";
- }
+ image.normal: "tooltip-base.png";
+ image.border: 7 7 6 8;
+ image.middle: SOLID;
}
}
- part { name: "arrow_area_right";
- type: RECT;
- mouse_events: 0;
- clip_to: "ctxpopup_clip";
+ part { name: "elm.swallow.content"; type: SWALLOW;
+ clip_to: "clip";
description { state: "default" 0.0;
- visible: 0;
- min: 20 0;
- fixed: 1 1;
- align: 0 0.5;
- rel1 {
- relative: 1 0;
- to:"base";
- }
- rel2 {
- to_y: "base";
- }
+ rel1 { to:"base"; offset: 8 6; }
+ rel2 { to:"base"; offset: -7 -8; }
}
}
- part { name: "arrow_area_up";
- type: RECT;
- mouse_events: 0;
- clip_to: "ctxpopup_clip";
+ part { name: "event"; type: RECT;
description { state: "default" 0.0;
- visible: 0;
- min: 0 20;
- fixed: 1 1;
- align: 0.5 1;
- rel1 {
- to_x: "base";
- }
- rel2 {
- relative: 1 0;
- to:"base";
- }
+ color: 0 0 0 0;
+ visible: 1;
}
- }
- part { name: "arrow_area_down";
- type: RECT;
- mouse_events: 0;
- clip_to: "ctxpopup_clip";
- description { state: "default" 0.0;
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
visible: 0;
- min: 0 20;
- fixed: 1 1;
- align: 0.5 0;
- rel1 {
- relative: 0 1;
- to:"base";
- }
- rel2 {
- to_x: "base";
- }
}
}
- part { name: "shadow";
- scale: 1;
- clip_to: "ctxpopup_clip";
+ part { name: "clip"; type: RECT;
description { state: "default" 0.0;
- rel1.offset: 0 0;
- rel2.offset: 7 7;
- image { normal: "led_square_shadow.png";
- border: 7 7 7 7;
- }
- }
- }
- part { name: "elm.swallow.arrow_up";
- type: SWALLOW;
- mouse_events: 0;
- scale: 1;
- clip_to: "ctxpopup_clip";
- dragable {
- x: 1 1 0;
- y: 1 1 0;
- confine: "arrow_area_up";
+ color: 255 255 255 0;
+ visible: 0;
+ rel1.offset: -20 -20;
+ rel2.offset: 19 19;
}
- description { state: "default" 0.0;
- min: 36 20;
- fixed: 1 1;
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
visible: 1;
}
}
- part { name: "elm.swallow.arrow_down";
- type: SWALLOW;
- mouse_events: 0;
- scale: 1;
- clip_to: "ctxpopup_clip";
- dragable {
- x: 1 1 0;
- y: 1 1 0;
- confine: "arrow_area_down";
- }
+
+ // 9x13
+ part { name: "arrow_area_left"; type: SPACER;
description { state: "default" 0.0;
- min: 36 20;
- fixed: 1 1;
- visible: 1;
+ min: 9 13;
+ fixed: 1 0;
+ align: 1.0 0.5;
+ rel1.to: "base";
+ rel1.offset: 2 5;
+ rel2.to: "base";
+ rel2.offset: 2 -6;
+ rel2.relative: 0.0 1.0;
}
}
- part { name: "elm.swallow.arrow_left";
- type: SWALLOW;
- mouse_events: 0;
- scale: 1;
- clip_to: "ctxpopup_clip";
- dragable {
- x: 1 1 0;
- y: 1 1 0;
- confine: "arrow_area_left";
- }
+ part { name: "elm.swallow.arrow_left"; type: SWALLOW; mouse_events: 0;
+ clip_to: "clip";
+ dragable.x: 1 1 0;
+ dragable.y: 1 1 0;
+ dragable.confine: "arrow_area_left";
description { state: "default" 0.0;
- min: 20 36;
+ min: 9 13;
fixed: 1 1;
- visible: 1;
}
}
- part { name: "elm.swallow.arrow_right";
- type: SWALLOW;
- mouse_events: 0;
- scale: 1;
- clip_to: "ctxpopup_clip";
- dragable {
- x: 1 1 0;
- y: 1 1 0;
- confine: "arrow_area_right";
- }
+
+ part { name: "arrow_area_right"; type: SPACER;
description { state: "default" 0.0;
- min: 20 36;
- fixed: 1 1;
- visible: 1;
+ min: 9 13;
+ fixed: 1 0;
+ align: 0.0 0.5;
+ rel1.to: "base";
+ rel1.offset: -3 5;
+ rel1.relative: 1.0 0.0;
+ rel2.to: "base";
+ rel2.offset: -3 -6;
}
}
- part { name: "base";
- scale: 1;
- clip_to: "ctxpopup_clip";
+ part { name: "elm.swallow.arrow_right"; type: SWALLOW; mouse_events: 0;
+ clip_to: "clip";
+ dragable.x: 1 1 0;
+ dragable.y: 1 1 0;
+ dragable.confine: "arrow_area_right";
description { state: "default" 0.0;
- image { normal: "vgrad_med_darker.png";
- border: 7 7 7 7;
- }
+ min: 9 13;
+ fixed: 1 1;
}
}
- part { name: "over";
- scale: 1;
- clip_to: "ctxpopup_clip";
+
+ // 11x9
+ part { name: "arrow_area_up"; type: SPACER;
description { state: "default" 0.0;
+ min: 11 9;
+ fixed: 1 1;
+ align: 0.5 1;
rel1.to: "base";
+ rel1.offset: 5 3;
rel2.to: "base";
- rel1.offset: -4 -4;
- rel2.offset: 2 2;
- image { normal: "led_square_shading.png";
- border: 7 7 7 7;
- }
+ rel2.offset: -6 3;
+ rel2.relative: 1.0 0.0;
}
}
- part { name: "elm.swallow.content";
- type: SWALLOW;
- clip_to: "ctxpopup_clip";
+ part { name: "elm.swallow.arrow_up"; type: SWALLOW; mouse_events: 0;
+ clip_to: "clip";
+ dragable.x: 1 1 0;
+ dragable.y: 1 1 0;
+ dragable.confine: "arrow_area_up";
description { state: "default" 0.0;
- rel1 { to:"base"; offset: 4 4; }
- rel2 { to:"base"; offset: -5 -5; }
+ min: 11 9;
+ fixed: 1 1;
}
}
- part { name: "event_blocker";
- type: RECT;
+
+ part { name: "arrow_area_down"; type: SPACER;
description { state: "default" 0.0;
- color: 0 0 0 0;
- visible: 1;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 0;
+ min: 11 9;
+ fixed: 1 1;
+ align: 0.5 0.0;
+ rel1.to: "base";
+ rel1.offset: 5 -4;
+ rel1.relative: 0.0 1.0;
+ rel2.to: "base";
+ rel2.offset: -6 -4;
}
}
- part { name: "ctxpopup_clip";
- type: RECT;
+ part { name: "elm.swallow.arrow_down"; type: SWALLOW; mouse_events: 0;
+ clip_to: "clip";
+ dragable.x: 1 1 0;
+ dragable.y: 1 1 0;
+ dragable.confine: "arrow_area_down";
description { state: "default" 0.0;
- rel1 { to:"base"; relative: 0 0; }
- rel2 { to:"base"; relative: 0 1; }
- }
- description { state: "show_up" 0.0;
- rel1 { to:"arrow_area_down"; relative: 0 1; }
- rel2 { to:"arrow_area_down"; relative: 1 1; }
- }
- description { state: "show_left" 0.0;
- rel1 { to:"arrow_area_right"; relative: 1 0; }
- rel2 { to:"arrow_area_right"; relative: 1 1; }
- }
- description { state: "show_right" 0.0;
- rel1 { to:"arrow_area_left"; relative: 0 0; }
- rel2 { to:"arrow_area_left"; relative: 0 1; }
- }
- description { state: "show_down" 0.0;
- rel1 { to:"arrow_area_up"; relative: 0 0; }
- rel2 { to:"arrow_area_up"; relative: 1 0; }
- }
- description { state: "hide_up" 0.0;
- rel1 { to:"arrow_area_down"; relative: 0 1; }
- rel2 { to:"arrow_area_down"; relative: 1 1; }
- }
- description { state: "hide_left" 0.0;
- rel1 { to:"arrow_area_right"; relative: 1 0; }
- rel2 { to:"arrow_area_right"; relative: 1 1; }
- }
- description { state: "hide_right" 0.0;
- rel1 { to:"arrow_area_left"; relative: 0 0; }
- rel2 { to:"arrow_area_left"; relative: 0 1; }
- }
- description { state: "hide_down" 0.0;
- rel1 { to:"arrow_area_up"; relative: 0 0; }
- rel2 { to:"arrow_area_up"; relative: 1 0; }
- }
- description { state: "visible" 0.0;
- rel1 { to_x:"arrow_area_left"; to_y:"arrow_area_up"; }
- rel2 { to_x:"arrow_area_right"; to_y:"arrow_area_down"; }
+ min: 11 9;
+ fixed: 1 1;
}
}
}
programs {
- program { name: "show";
- signal: "elm,state,show";
- source: "elm";
+ program {
+ signal: "elm,state,show"; source: "elm";
action: STATE_SET "visible" 0.0;
- target: "ctxpopup_clip";
- target: "event_blocker";
- transition: LINEAR 0.25;
+ transition: LINEAR 0.2;
+ target: "clip";
+ target: "event";
}
- program { name: "hide";
- signal: "elm,state,hide";
- source: "elm";
+ program {
+ signal: "elm,state,hide"; source: "elm";
action: STATE_SET "default" 0.0;
- target: "event_blocker";
- }
- program { name: "show_up";
- signal: "elm,state,show,up";
- source: "elm";
- action: STATE_SET "show_up" 0.0;
- transition: LINEAR 0.25;
- target: "ctxpopup_clip";
- }
- program { name: "show_left";
- signal: "elm,state,show,left";
- source: "elm";
- action: STATE_SET "show_left" 0.0;
- transition: LINEAR 0.25;
- target: "ctxpopup_clip";
- }
- program { name: "show_right";
- signal: "elm,state,show,right";
- source: "elm";
- action: STATE_SET "show_right" 0.0;
- transition: LINEAR 0.25;
- target: "ctxpopup_clip";
- }
- program { name: "show_down";
- signal: "elm,state,show,down";
- source: "elm";
- action: STATE_SET "show_down" 0.0;
- transition: LINEAR 0.25;
- target: "ctxpopup_clip";
- }
- program { name: "hide_up";
- signal: "elm,state,hide,up";
- source: "elm";
- action: STATE_SET "hide_up" 0.0;
- transition: LINEAR 0.25;
- target: "ctxpopup_clip";
- after: "hide_finished";
+ transition: LINEAR 0.3;
+ target: "clip";
+ target: "event";
+ after: "hide2";
}
- program { name: "hide_left";
- signal: "elm,state,hide,left";
- source: "elm";
- action: STATE_SET "hide_left" 0.0;
- transition: LINEAR 0.25;
- target: "ctxpopup_clip";
- after: "hide_finished";
- }
- program { name: "hide_right";
- signal: "elm,state,hide,right";
- source: "elm";
- action: STATE_SET "hide_right" 0.0;
- transition: LINEAR 0.25;
- target: "ctxpopup_clip";
- after: "hide_finished";
- }
- program { name: "hide_down";
- signal: "elm,state,hide,down";
- source: "elm";
- action: STATE_SET "hide_down" 0.0;
- transition: LINEAR 0.25;
- target: "ctxpopup_clip";
- after: "hide_finished";
- }
- program { name: "hide_finished";
+ program { name: "hide2";
action: SIGNAL_EMIT "elm,action,hide,finished" "elm";
}
@@ -369,78 +201,63 @@ group { name: "elm/ctxpopup/base/default";
}
group { name: "elm/ctxpopup/arrow/default";
- images {
- image: "ctxpopup_arrow_left.png" COMP;
- image: "ctxpopup_arrow_right.png" COMP;
- image: "ctxpopup_arrow_up.png" COMP;
- image: "ctxpopup_arrow_down.png" COMP;
- }
+ 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: "ctxpopup_arrow";
- type: IMAGE;
- scale: 1;
- description {
- state: "default" 0.0;
- min: 36 36;
+ part { name: "base";
+ description { state: "default" 0.0;
+ min: 9 9;
fixed: 1 1;
- visible: 0;
- align: 0.5 0.5;
+ image.normal: "tooltip-edge-left-tip.png";
}
- description {
- state: "left" 0.0;
- min: 20 36;
- fixed: 1 1;
+ description { state: "left" 0.0;
+ inherit: "default" 0.0;
+ min: 9 13;
align: 0.0 0.5;
- rel1 { offset: 0 4; }
- image { normal: "ctxpopup_arrow_left.png"; }
+ image.normal: "tooltip-edge-left-tip.png";
}
description { state: "right" 0.0;
- min: 20 36;
- fixed: 1 1;
+ inherit: "default" 0.0;
+ min: 9 13;
align: 1.0 0.5;
- rel1 { offset: 4 4; }
- image { normal: "ctxpopup_arrow_right.png"; }
+ image.normal: "tooltip-edge-right-tip.png";
}
description { state: "top" 0.0;
- min: 36 20;
- fixed: 1 1;
+ inherit: "default" 0.0;
+ min: 11 9;
align: 0.5 0.0;
- rel1 { offset: 2 0; }
- image { normal: "ctxpopup_arrow_up.png"; }
+ image.normal: "tooltip-edge-top-tip.png";
}
description { state: "bottom" 0.0;
- min: 36 20;
- fixed: 1 1;
+ inherit: "default" 0.0;
+ min: 11 9;
align: 0.5 1.0;
- rel1 { offset: 2 0; }
- image { normal: "ctxpopup_arrow_down.png"; }
+ image.normal: "tooltip-edge-bottom-tip.png";
}
}
}
programs {
- program { name: "enable_left_arrow";
- signal: "elm,state,left";
- source: "elm";
+ program {
+ signal: "elm,state,left"; source: "elm";
action: STATE_SET "left" 0.0;
- target: "ctxpopup_arrow";
+ target: "base";
}
- program { name: "enable_right_arrow";
- signal: "elm,state,right";
- source: "elm";
+ program {
+ signal: "elm,state,right"; source: "elm";
action: STATE_SET "right" 0.0;
- target: "ctxpopup_arrow";
+ target: "base";
}
- program { name: "enable_top_arrow";
- signal: "elm,state,top";
- source: "elm";
+ program {
+ signal: "elm,state,top"; source: "elm";
action: STATE_SET "top" 0.0;
- target: "ctxpopup_arrow";
+ target: "base";
}
- program { name: "enable_bottom_arrow";
- signal: "elm,state,bottom";
- source: "elm";
+ program {
+ signal: "elm,state,bottom"; source: "elm";
action: STATE_SET "bottom" 0.0;
- target: "ctxpopup_arrow";
+ target: "base";
}
}
}
diff --git a/edje/edc/elm/tooltip.edc b/edje/edc/elm/tooltip.edc
index 12a85d0..264c63d 100644
--- a/edje/edc/elm/tooltip.edc
+++ b/edje/edc/elm/tooltip.edc
@@ -9,9 +9,7 @@ group { name: "elm/label/base/tooltip";
}
}
parts {
- part { name: "elm.text";
- type: TEXTBLOCK;
- mouse_events: 0;
+ part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
text {
@@ -25,26 +23,24 @@ group { name: "elm/label/base/tooltip";
group { name: "elm/tooltip/base/default";
min: 30 30;
- data {
- item: "pad_x" "20";
- item: "pad_y" "20";
- item: "pad_border_x" "10";
- item: "pad_border_y" "10";
- /* tooltip is hidden after this amount.
- Keep in syn with hide animations */
- item: "hide_timeout" "0.35";
- }
- images {
- image: "tooltip-base.png" COMP;
- image: "tooltip-corner-top-left-tip.png" COMP;
- image: "tooltip-corner-top-right-tip.png" COMP;
- image: "tooltip-corner-bottom-left-tip.png" COMP;
- image: "tooltip-corner-bottom-right-tip.png" COMP;
- image: "tooltip-edge-left-tip.png" COMP;
- image: "tooltip-edge-right-tip.png" COMP;
- image: "tooltip-edge-bottom-tip.png" COMP;
- image: "tooltip-edge-top-tip.png" COMP;
- }
+ data.item: "pad_x" "10";
+ data.item: "pad_y" "10";
+ data.item: "pad_border_x" "1";
+ data.item: "pad_border_y" "1";
+ /* tooltip is hidden after this amount.
+ Keep in syn with hide animations */
+ data.item: "hide_timeout" "0.35";
+ // if in a window... it's transparent!
+ data.item: "transparent" "enabled";
+ images.image: "tooltip-base.png" COMP;
+ images.image: "tooltip-corner-top-left-tip.png" COMP;
+ images.image: "tooltip-corner-top-right-tip.png" COMP;
+ images.image: "tooltip-corner-bottom-left-tip.png" COMP;
+ images.image: "tooltip-corner-bottom-right-tip.png" COMP;
+ 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;
script {
hide_corners() {
set_state(PART:"corner-top-left", "default", 0.0);
@@ -145,8 +141,7 @@ group { name: "elm/tooltip/base/default";
}
}
parts {
- part { name: "clipper";
- type: RECT;
+ part { name: "clipper"; type: RECT;
description { state: "default" 0.0;
color: 255 255 255 0;
rel1 { to: "pop"; offset: -5 -5; }
@@ -157,8 +152,7 @@ group { name: "elm/tooltip/base/default";
color: 255 255 255 255;
}
}
- part { name: "pop";
- mouse_events: 0;
+ part { name: "pop"; mouse_events: 0;
clip_to: "clipper";
scale: 1;
description { state: "default" 0.0;
@@ -179,9 +173,7 @@ group { name: "elm/tooltip/base/default";
}
}
#define TT_CORNER(name_, rx, ry, ax, ay, ox, oy) \
- part { name: "corner-"name_; \
- type: IMAGE; \
- mouse_events: 0; \
+ part { name: "corner-"name_; mouse_events: 0; \
clip_to: "clipper"; \
scale: 1; \
description { state: "default" 0.0; \
@@ -212,8 +204,7 @@ group { name: "elm/tooltip/base/default";
#undef TT_CORNER
#define TT_EDGE_VERT(name_, rx, ax, ox) \
- part { name: "clipper-edge-"name_; \
- type: RECT; \
+ part { name: "clipper-edge-"name_; type: RECT; \
clip_to: "clipper"; \
description { state: "default" 0.0; \
visible: 0; \
@@ -236,9 +227,7 @@ group { name: "elm/tooltip/base/default";
visible: 1; \
} \
} \
- part { name: "edge-area-"name_; \
- type: RECT; \
- mouse_events: 0; \
+ part { name: "edge-area-"name_; type: RECT; mouse_events: 0; \
clip_to: "clipper-edge-"name_; \
scale: 1; \
description { state: "default" 0.0; \
@@ -258,9 +247,7 @@ group { name: "elm/tooltip/base/default";
} \
} \
} \
- part { name: "edge-drag-"name_; \
- type: RECT; \
- mouse_events: 0; \
+ part { name: "edge-drag-"name_; type: RECT; mouse_events: 0; \
clip_to: "clipper-edge-"name_; \
scale: 1; \
dragable { \
@@ -275,9 +262,7 @@ group { name: "elm/tooltip/base/default";
rel2.to: "edge-area-"name_; \
} \
} \
- part { name: "edge-img-"name_; \
- type: IMAGE; \
- mouse_events: 0; \
+ part { name: "edge-img-"name_; mouse_events: 0; \
clip_to: "clipper-edge-"name_; \
description { state: "default" 0.0; \
FIXED_SIZE(9, 13) \
@@ -292,8 +277,7 @@ group { name: "elm/tooltip/base/default";
#undef TT_EDGE_VERT
#define TT_EDGE_HORIZ(name_, ry, ay, oy) \
- part { name: "clipper-edge-"name_; \
- type: RECT; \
+ part { name: "clipper-edge-"name_; type: RECT; \
clip_to: "clipper"; \
scale: 1; \
description { state: "default" 0.0; \
@@ -317,9 +301,7 @@ group { name: "elm/tooltip/base/default";
visible: 1; \
} \
} \
- part { name: "edge-area-"name_; \
- type: RECT; \
- mouse_events: 0; \
+ part { name: "edge-area-"name_; type: RECT; mouse_events: 0; \
clip_to: "clipper-edge-"name_; \
scale: 1; \
description { state: "default" 0.0; \
@@ -331,9 +313,7 @@ group { name: "elm/tooltip/base/default";
rel2.to: "clipper-edge-"name_; \
} \
} \
- part { name: "edge-drag-"name_; \
- type: RECT; \
- mouse_events: 0; \
+ part { name: "edge-drag-"name_; type: RECT; mouse_events: 0; \
clip_to: "clipper-edge-"name_; \
scale: 1; \
dragable { \
@@ -348,9 +328,7 @@ group { name: "elm/tooltip/base/default";
rel2.to: "edge-area-"name_; \
} \
} \
- part { name: "edge-img-"name_; \
- type: IMAGE; \
- mouse_events: 0; \
+ part { name: "edge-img-"name_; mouse_events: 0; \
clip_to: "clipper-edge-"name_; \
scale: 1; \
description { state: "default" 0.0; \
@@ -364,8 +342,7 @@ group { name: "elm/tooltip/base/default";
TT_EDGE_HORIZ("top", 0, 1, -1);
TT_EDGE_HORIZ("bottom", 1, 0, 1);
#undef TT_EDGE_HORIZ
- part { name: "clipper_content";
- type: RECT;
+ part { name: "clipper_content"; type: RECT;
description { state: "default" 0.0;
color: 255 255 255 0;
rel1.to: "elm.swallow.content";
@@ -376,16 +353,16 @@ group { name: "elm/tooltip/base/default";
color: 255 255 255 255;
}
}
- part { name: "elm.swallow.content";
- type: SWALLOW;
+ part { name: "elm.swallow.content"; type: SWALLOW;
clip_to: "clipper_content";
- description { state: "default" 0.0; }
+ description { state: "default" 0.0;
+ rel1.offset: 10 10;
+ rel2.offset: -11 -11;
+ }
}
programs {
- program {
- name: "show0";
- signal: "elm,action,show";
- source: "elm";
+ program { name: "show0";
+ signal: "elm,action,show"; source: "elm";
action: ACTION_STOP;
target: "hide0";
target: "hide1";
@@ -394,23 +371,19 @@ group { name: "elm/tooltip/base/default";
after: "show1";
after: "show2";
}
- program {
- name: "show1";
+ program { name: "show1";
action: STATE_SET "visible" 0.0;
transition: LINEAR 0.15;
target: "clipper";
}
- program {
- name: "show2";
+ program { name: "show2";
in: 0.1 0.0;
action: STATE_SET "visible" 0.0;
transition: LINEAR 0.15;
target: "clipper_content";
}
- program {
- name: "hide0";
- signal: "elm,action,hide";
- source: "elm";
+ program { name: "hide0";
+ signal: "elm,action,hide"; source: "elm";
action: ACTION_STOP;
target: "show0";
target: "show1";
@@ -419,21 +392,18 @@ group { name: "elm/tooltip/base/default";
after: "hide2";
after: "hide3";
}
- program {
- name: "hide1";
+ program { name: "hide1";
script {
hide_corners();
hide_edges();
}
}
- program {
- name: "hide2";
+ program { name: "hide2";
action: STATE_SET "default" 0.0;
transition: LINEAR 0.1;
target: "clipper_content";
}
- program {
- name: "hide3";
+ program { name: "hide3";
in: 0.1 0.0;
action: STATE_SET "default" 0.0;
transition: LINEAR 0.1;
@@ -442,16 +412,13 @@ group { name: "elm/tooltip/base/default";
}
}
}
+
group { name: "elm/tooltip/base/transparent";
- data {
- item: "pad_x" "10";
- item: "pad_y" "10";
- item: "transparent" "enabled";
- }
+ data.item: "pad_x" "10";
+ data.item: "pad_y" "10";
+ data.item: "transparent" "enabled";
parts {
- part { name: "elm.swallow.content";
- type: SWALLOW;
- mouse_events: 0;
+ part { name: "elm.swallow.content"; type: SWALLOW; mouse_events: 0;
scale: 1;
description { state: "default" 0.0; }
}
--
