raster pushed a commit to branch master.
commit 27105095a57836adc3fa2c653226891ee446ae0d
Author: Carsten Haitzler (Rasterman) <[email protected]>
Date: Mon Jul 29 21:40:32 2013 +0900
tooltip polishing gfx-wise.
---
edje/dark.edc | 1 -
edje/edc/elm/tooltip.edc | 45 ++++++++++-----------------
edje/img/tooltip-base.png | Bin 641 -> 633 bytes
edje/img/tooltip-corner-bottom-left-tip.png | Bin 356 -> 431 bytes
edje/img/tooltip-corner-bottom-right-tip.png | Bin 362 -> 442 bytes
edje/img/tooltip-corner-top-left-tip.png | Bin 424 -> 475 bytes
edje/img/tooltip-corner-top-right-tip.png | Bin 413 -> 467 bytes
edje/img/tooltip-edge-bottom-tip.png | Bin 299 -> 286 bytes
edje/img/tooltip-edge-left-tip.png | Bin 277 -> 357 bytes
edje/img/tooltip-edge-right-tip.png | Bin 270 -> 305 bytes
edje/img/tooltip-edge-top-tip.png | Bin 279 -> 279 bytes
edje/img/tooltip_over_top.png | Bin 229 -> 0 bytes
mock-18.xcf.gz | Bin 612340 -> 612340 bytes
13 files changed, 16 insertions(+), 30 deletions(-)
diff --git a/edje/dark.edc b/edje/dark.edc
index b21c2cf..4e55a09 100644
--- a/edje/dark.edc
+++ b/edje/dark.edc
@@ -44,7 +44,6 @@ collections {
// XXX: fix gfx for actionslider - add glow on click like scrollbar. fix
shadow under text (grey not blakc)
#include "edc/elm/actionslider.edc"
//#include "edc/elm/photocam.edc"
-// XXX: tooltip graphics need some work to look "perfect", but good job!
#include "edc/elm/tooltip.edc"
// XXX: fix gfx for colorsel - too much to talk about here. just look at it.
#include "edc/elm/colorsel.edc"
diff --git a/edje/edc/elm/tooltip.edc b/edje/edc/elm/tooltip.edc
index f9a9779..12a85d0 100644
--- a/edje/edc/elm/tooltip.edc
+++ b/edje/edc/elm/tooltip.edc
@@ -44,7 +44,6 @@ group { name: "elm/tooltip/base/default";
image: "tooltip-edge-right-tip.png" COMP;
image: "tooltip-edge-bottom-tip.png" COMP;
image: "tooltip-edge-top-tip.png" COMP;
- image: "tooltip_over_top.png" COMP;
}
script {
hide_corners() {
@@ -166,15 +165,15 @@ group { name: "elm/tooltip/base/default";
min: 30 30;
rel1 {
to: "elm.swallow.content";
- offset: -5 -5;
+ offset: -5 -4;
}
rel2 {
to: "elm.swallow.content";
- offset: 4 4;
+ offset: 4 5;
}
image {
normal: "tooltip-base.png";
- border: 5 5 5 5;
+ border: 7 7 6 8;
}
image.middle: SOLID;
}
@@ -192,12 +191,12 @@ group { name: "elm/tooltip/base/default";
rel1 { \
relative: rx ry; \
offset: ox oy; \
- to: "elm.swallow.content"; \
+ to: "pop"; \
} \
rel2 { \
relative: rx ry; \
offset: ox oy; \
- to: "elm.swallow.content"; \
+ to: "pop"; \
} \
image.normal: "tooltip-corner-"name_"-tip.png"; \
} \
@@ -206,31 +205,19 @@ group { name: "elm/tooltip/base/default";
visible: 1; \
} \
}
- TT_CORNER("top-left", 0, 0, 1, 1, 2, 1);
- TT_CORNER("top-right", 1, 0, 0, 1, -3, 1);
- TT_CORNER("bottom-left", 0, 1, 1, 0, 2, -5);
- TT_CORNER("bottom-right", 1, 1, 0, 0, -5, -5);
+ TT_CORNER("top-left", 0, 0, 0, 0, -4, -5);
+ TT_CORNER("top-right", 1, 0, 1, 0, 3, -5);
+ TT_CORNER("bottom-left", 0, 1, 0, 1, -4, 2);
+ TT_CORNER("bottom-right", 1, 1, 1, 1, 3, 2);
#undef TT_CORNER
- part { name: "over";
- type: IMAGE;
- mouse_events: 0;
- clip_to: "clipper";
- description { state: "default" 0.0;
- rel1 { to: "pop"; offset: 1 0; }
- rel2 { to: "pop"; relative: 1.0 0.4; offset: -2 0; }
- image.normal: "tooltip_over_top.png";
- image.border: 3 3 0 0;
- }
- }
-
#define TT_EDGE_VERT(name_, rx, ax, ox) \
part { name: "clipper-edge-"name_; \
type: RECT; \
clip_to: "clipper"; \
description { state: "default" 0.0; \
visible: 0; \
- min: 8 11; \
+ min: 9 13; \
align: ax 0.5; \
fixed: 1 1; \
rel1 { \
@@ -256,7 +243,7 @@ group { name: "elm/tooltip/base/default";
scale: 1; \
description { state: "default" 0.0; \
color: 0 0 0 0; \
- min: 8 11; \
+ min: 9 13; \
align: ax 0.5; \
fixed: 1 1; \
rel1 { \
@@ -283,7 +270,7 @@ group { name: "elm/tooltip/base/default";
} \
description { state: "default" 0.0; \
color: 0 0 0 0; \
- min: 8 11; \
+ min: 9 13; \
rel1.to: "edge-area-"name_; \
rel2.to: "edge-area-"name_; \
} \
@@ -293,7 +280,7 @@ group { name: "elm/tooltip/base/default";
mouse_events: 0; \
clip_to: "clipper-edge-"name_; \
description { state: "default" 0.0; \
- FIXED_SIZE(8, 11) \
+ FIXED_SIZE(9, 13) \
align: ax 0.5; \
rel1.to: "edge-drag-"name_; \
rel2.to: "edge-drag-"name_; \
@@ -301,7 +288,7 @@ group { name: "elm/tooltip/base/default";
} \
}
TT_EDGE_VERT("left", 0, 1, -3);
- TT_EDGE_VERT("right", 1, 0, 1);
+ TT_EDGE_VERT("right", 1, 0, 2);
#undef TT_EDGE_VERT
#define TT_EDGE_HORIZ(name_, ry, ay, oy) \
@@ -374,8 +361,8 @@ group { name: "elm/tooltip/base/default";
image.normal: "tooltip-edge-"name_"-tip.png"; \
} \
}
- TT_EDGE_HORIZ("top", 0, 1, -2);
- TT_EDGE_HORIZ("bottom", 1, 0, 0);
+ TT_EDGE_HORIZ("top", 0, 1, -1);
+ TT_EDGE_HORIZ("bottom", 1, 0, 1);
#undef TT_EDGE_HORIZ
part { name: "clipper_content";
type: RECT;
diff --git a/edje/img/tooltip-base.png b/edje/img/tooltip-base.png
index 42a0d89..5200f53 100644
Binary files a/edje/img/tooltip-base.png and b/edje/img/tooltip-base.png differ
diff --git a/edje/img/tooltip-corner-bottom-left-tip.png
b/edje/img/tooltip-corner-bottom-left-tip.png
index 11fa488..a9a47d8 100644
Binary files a/edje/img/tooltip-corner-bottom-left-tip.png and
b/edje/img/tooltip-corner-bottom-left-tip.png differ
diff --git a/edje/img/tooltip-corner-bottom-right-tip.png
b/edje/img/tooltip-corner-bottom-right-tip.png
index d898542..a154869 100644
Binary files a/edje/img/tooltip-corner-bottom-right-tip.png and
b/edje/img/tooltip-corner-bottom-right-tip.png differ
diff --git a/edje/img/tooltip-corner-top-left-tip.png
b/edje/img/tooltip-corner-top-left-tip.png
index b9613a3..84acbe2 100644
Binary files a/edje/img/tooltip-corner-top-left-tip.png and
b/edje/img/tooltip-corner-top-left-tip.png differ
diff --git a/edje/img/tooltip-corner-top-right-tip.png
b/edje/img/tooltip-corner-top-right-tip.png
index 57f75bb..1ebec77 100644
Binary files a/edje/img/tooltip-corner-top-right-tip.png and
b/edje/img/tooltip-corner-top-right-tip.png differ
diff --git a/edje/img/tooltip-edge-bottom-tip.png
b/edje/img/tooltip-edge-bottom-tip.png
index b77c9ac..71ff0dd 100644
Binary files a/edje/img/tooltip-edge-bottom-tip.png and
b/edje/img/tooltip-edge-bottom-tip.png differ
diff --git a/edje/img/tooltip-edge-left-tip.png
b/edje/img/tooltip-edge-left-tip.png
index ac67442..ef89115 100644
Binary files a/edje/img/tooltip-edge-left-tip.png and
b/edje/img/tooltip-edge-left-tip.png differ
diff --git a/edje/img/tooltip-edge-right-tip.png
b/edje/img/tooltip-edge-right-tip.png
index 07f886e..fea799c 100644
Binary files a/edje/img/tooltip-edge-right-tip.png and
b/edje/img/tooltip-edge-right-tip.png differ
diff --git a/edje/img/tooltip-edge-top-tip.png
b/edje/img/tooltip-edge-top-tip.png
index dcb2893..15d37e4 100644
Binary files a/edje/img/tooltip-edge-top-tip.png and
b/edje/img/tooltip-edge-top-tip.png differ
diff --git a/edje/img/tooltip_over_top.png b/edje/img/tooltip_over_top.png
deleted file mode 100644
index 6337e1b..0000000
Binary files a/edje/img/tooltip_over_top.png and /dev/null differ
diff --git a/mock-18.xcf.gz b/mock-18.xcf.gz
index 08b2c71..91b7536 100644
Binary files a/mock-18.xcf.gz and b/mock-18.xcf.gz differ
--
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
