diff --git a/data/elementary/themes/edc/elm/tooltip.edc b/data/elementary/themes/edc/elm/tooltip.edc index 82d1df69bf..7854305e39 100644 --- a/data/elementary/themes/edc/elm/tooltip.edc +++ b/data/elementary/themes/edc/elm/tooltip.edc @@ -3,10 +3,10 @@ group { name: "elm/label/base/tooltip/default"; alias: "elm/label/base/tooltip/transparent"; styles { style { name: "tooltip_style"; - base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 text_class=bubble"; + base: "font="FNBD" font_size=10 color=#ffffff text_class=bubble align=0.5"; tag: "br" "\n"; - tag: "hilight" "+ font="FN" text_class=bubble"; - tag: "b" "+ font="FN" text_class=bubble"; + tag: "hilight" "+ font="FNBD" text_class=bubble color=#ff9933"; + tag: "b" "+ font="FNBD" text_class=bubble color=#3399ff"; tag: "tab" "\t"; } } @@ -35,7 +35,6 @@ group { name: "elm/tooltip/base/default"; 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; @@ -145,40 +144,39 @@ group { name: "elm/tooltip/base/default"; } parts { part { name: "clipper"; type: RECT; + scale: 1; description { state: "default" 0.0; color: 255 255 255 0; - rel1 { to: "pop"; offset: -5 -5; } - rel2 { to: "pop"; offset: 5 5; } + rel1 { to: "pop"; offset: -500 -500; } + rel2 { to: "pop"; offset: 499 499; } + offscale; } description { state: "visible" 0.0; inherit: "default" 0.0; color: 255 255 255 255; } } - part { name: "pop"; mouse_events: 0; + part { name: "shadow"; mouse_events: 0; clip_to: "clipper"; - scale: 1; description { state: "default" 0.0; - min: 30 30; - rel1 { - to: "elm.swallow.content"; - offset: -5 -4; - } - rel2 { - to: "elm.swallow.content"; - offset: 4 5; - } - image { - normal: "tooltip-base.png"; - border: 7 7 6 8; - } - image.middle: SOLID; + rel.to: "pop"; + WIN_SHADOW; + } + } + part { name: "pop"; type: RECT; mouse_events: 0; + scale: 1; + clip_to: "clipper"; + description { state: "default" 0.0; + rel.to: "elm.swallow.content"; + rel1.offset: -10 -10; + rel2.offset: 9 9; + color: 0 0 0 192; + offscale; } } #define TT_CORNER(name_, rx, ry, ax, ay, ox, oy) \ part { name: "corner-"name_; mouse_events: 0; \ clip_to: "clipper"; \ - scale: 1; \ description { state: "default" 0.0; \ visible: 0; \ align: ax ay; \ @@ -194,16 +192,17 @@ group { name: "elm/tooltip/base/default"; to: "pop"; \ } \ image.normal: "tooltip-corner-"name_"-tip.png"; \ + color: 0 0 0 192; \ } \ description { state: "visible" 0.0; \ inherit: "default" 0.0; \ visible: 1; \ } \ } - 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); + TT_CORNER("top-left", 0, 0, 0, 0, -6, -6); + TT_CORNER("top-right", 1, 0, 1, 0, 5, -6); + TT_CORNER("bottom-left", 0, 1, 0, 1, -6, 5); + TT_CORNER("bottom-right", 1, 1, 1, 1, 5, 5); #undef TT_CORNER #define TT_EDGE_VERT(name_, rx, ax, ox) \ @@ -211,18 +210,18 @@ group { name: "elm/tooltip/base/default"; clip_to: "clipper"; \ description { state: "default" 0.0; \ visible: 0; \ - min: 9 13; \ + min: 12 11; \ align: ax 0.5; \ fixed: 1 1; \ rel1 { \ relative: rx 0.0; \ offset: ox 0; \ - to: "elm.swallow.content"; \ + to: "pop"; \ } \ rel2 { \ relative: rx 1.0; \ offset: ox 0; \ - to: "elm.swallow.content"; \ + to: "pop"; \ } \ } \ description { state: "visible" 0.0; \ @@ -232,27 +231,25 @@ group { name: "elm/tooltip/base/default"; } \ part { name: "edge-area-"name_; type: RECT; mouse_events: 0; \ clip_to: "clipper-edge-"name_; \ - scale: 1; \ description { state: "default" 0.0; \ color: 0 0 0 0; \ - min: 9 13; \ + min: 12 11; \ align: ax 0.5; \ fixed: 1 1; \ rel1 { \ relative: rx 0.0; \ offset: ox 0; \ - to: "elm.swallow.content"; \ + to: "pop"; \ } \ rel2 { \ relative: rx 1.0; \ offset: ox 0; \ - to: "elm.swallow.content"; \ + to: "pop"; \ } \ } \ } \ part { name: "edge-drag-"name_; type: RECT; mouse_events: 0; \ clip_to: "clipper-edge-"name_; \ - scale: 1; \ dragable { \ x: 0 0 0; \ y: 1 1 0; \ @@ -260,43 +257,41 @@ group { name: "elm/tooltip/base/default"; } \ description { state: "default" 0.0; \ color: 0 0 0 0; \ - min: 9 13; \ - rel1.to: "edge-area-"name_; \ - rel2.to: "edge-area-"name_; \ + min: 12 11; \ + rel.to: "edge-area-"name_; \ } \ } \ part { name: "edge-img-"name_; mouse_events: 0; \ clip_to: "clipper-edge-"name_; \ description { state: "default" 0.0; \ - FIXED_SIZE(9, 13) \ + FIXED_SIZE(12, 11) \ align: ax 0.5; \ - rel1.to: "edge-drag-"name_; \ - rel2.to: "edge-drag-"name_; \ + rel.to: "edge-drag-"name_; \ image.normal: "tooltip-edge-"name_"-tip.png"; \ + color: 0 0 0 192; \ } \ } - TT_EDGE_VERT("left", 0, 1, -3); - TT_EDGE_VERT("right", 1, 0, 2); + TT_EDGE_VERT("left", 0, 0, -6); + TT_EDGE_VERT("right", 1, 1, 5); #undef TT_EDGE_VERT #define TT_EDGE_HORIZ(name_, ry, ay, oy) \ part { name: "clipper-edge-"name_; type: RECT; \ clip_to: "clipper"; \ - scale: 1; \ description { state: "default" 0.0; \ visible: 0; \ - min: 11 9; \ + min: 11 12; \ align: 0.5 ay; \ fixed: 1 1; \ rel1 { \ relative: 0.0 ry; \ offset: 0 oy; \ - to: "elm.swallow.content"; \ + to: "pop"; \ } \ rel2 { \ relative: 1.0 ry; \ offset: 0 oy; \ - to: "elm.swallow.content"; \ + to: "pop"; \ } \ } \ description { state: "visible" 0.0; \ @@ -306,19 +301,16 @@ group { name: "elm/tooltip/base/default"; } \ part { name: "edge-area-"name_; type: RECT; mouse_events: 0; \ clip_to: "clipper-edge-"name_; \ - scale: 1; \ description { state: "default" 0.0; \ color: 0 0 0 0; \ - min: 11 9; \ + min: 11 12; \ align: 0.5 ay; \ fixed: 1 1; \ - rel1.to: "clipper-edge-"name_; \ - rel2.to: "clipper-edge-"name_; \ + rel.to: "clipper-edge-"name_; \ } \ } \ part { name: "edge-drag-"name_; type: RECT; mouse_events: 0; \ clip_to: "clipper-edge-"name_; \ - scale: 1; \ dragable { \ x: 1 1 0; \ y: 0 0 0; \ @@ -326,30 +318,28 @@ group { name: "elm/tooltip/base/default"; } \ description { state: "default" 0.0; \ color: 0 0 0 0; \ - min: 11 9; \ - rel1.to: "edge-area-"name_; \ - rel2.to: "edge-area-"name_; \ + min: 11 12; \ + rel.to: "edge-area-"name_; \ } \ } \ part { name: "edge-img-"name_; mouse_events: 0; \ clip_to: "clipper-edge-"name_; \ - scale: 1; \ description { state: "default" 0.0; \ - FIXED_SIZE(11, 9) \ + FIXED_SIZE(11, 12) \ align: 0.5 ay; \ - rel1.to: "edge-drag-"name_; \ - rel2.to: "edge-drag-"name_; \ + rel.to: "edge-drag-"name_; \ image.normal: "tooltip-edge-"name_"-tip.png"; \ + color: 0 0 0 192; \ } \ } - TT_EDGE_HORIZ("top", 0, 1, -1); - TT_EDGE_HORIZ("bottom", 1, 0, 1); + TT_EDGE_HORIZ("top", 0, 0, -6); + TT_EDGE_HORIZ("bottom", 1, 1, 5); #undef TT_EDGE_HORIZ + part { name: "clipper_content"; type: RECT; description { state: "default" 0.0; color: 255 255 255 0; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; + rel.to: "elm.swallow.content"; } description { state: "visible" 0.0; inherit: "default" 0.0; @@ -358,9 +348,12 @@ group { name: "elm/tooltip/base/default"; } part { name: "elm.swallow.content"; type: SWALLOW; clip_to: "clipper_content"; + scale: 1; description { state: "default" 0.0; - rel1.offset: 10 10; - rel2.offset: -11 -11; + min: 48 24; + rel1.offset: 20 20; + rel2.offset: -21 -21; + offscale; } } programs { diff --git a/data/elementary/themes/img/tooltip-corner-bottom-left-tip.png b/data/elementary/themes/img/tooltip-corner-bottom-left-tip.png index a9a47d8d61..35f49d49c3 100644 Binary files a/data/elementary/themes/img/tooltip-corner-bottom-left-tip.png and b/data/elementary/themes/img/tooltip-corner-bottom-left-tip.png differ diff --git a/data/elementary/themes/img/tooltip-corner-bottom-right-tip.png b/data/elementary/themes/img/tooltip-corner-bottom-right-tip.png index a154869d4d..1b903a582b 100644 Binary files a/data/elementary/themes/img/tooltip-corner-bottom-right-tip.png and b/data/elementary/themes/img/tooltip-corner-bottom-right-tip.png differ diff --git a/data/elementary/themes/img/tooltip-corner-top-left-tip.png b/data/elementary/themes/img/tooltip-corner-top-left-tip.png index 84acbe22c1..08084d42eb 100644 Binary files a/data/elementary/themes/img/tooltip-corner-top-left-tip.png and b/data/elementary/themes/img/tooltip-corner-top-left-tip.png differ diff --git a/data/elementary/themes/img/tooltip-corner-top-right-tip.png b/data/elementary/themes/img/tooltip-corner-top-right-tip.png index 1ebec77231..814b9a47e3 100644 Binary files a/data/elementary/themes/img/tooltip-corner-top-right-tip.png and b/data/elementary/themes/img/tooltip-corner-top-right-tip.png differ diff --git a/data/elementary/themes/img/tooltip-edge-bottom-tip.png b/data/elementary/themes/img/tooltip-edge-bottom-tip.png index 71ff0dd156..40f4ba0086 100644 Binary files a/data/elementary/themes/img/tooltip-edge-bottom-tip.png and b/data/elementary/themes/img/tooltip-edge-bottom-tip.png differ diff --git a/data/elementary/themes/img/tooltip-edge-left-tip.png b/data/elementary/themes/img/tooltip-edge-left-tip.png index ef89115b4e..d946c8f4e0 100644 Binary files a/data/elementary/themes/img/tooltip-edge-left-tip.png and b/data/elementary/themes/img/tooltip-edge-left-tip.png differ diff --git a/data/elementary/themes/img/tooltip-edge-right-tip.png b/data/elementary/themes/img/tooltip-edge-right-tip.png index fea799c6f6..5fe8a03cd7 100644 Binary files a/data/elementary/themes/img/tooltip-edge-right-tip.png and b/data/elementary/themes/img/tooltip-edge-right-tip.png differ diff --git a/data/elementary/themes/img/tooltip-edge-top-tip.png b/data/elementary/themes/img/tooltip-edge-top-tip.png index 15d37e4592..cf0852ec7a 100644 Binary files a/data/elementary/themes/img/tooltip-edge-top-tip.png and b/data/elementary/themes/img/tooltip-edge-top-tip.png differ diff --git a/data/elementary/themes/img/tooltip_corner.svg b/data/elementary/themes/img/tooltip_corner.svg new file mode 100644 index 0000000000..ae70834259 --- /dev/null +++ b/data/elementary/themes/img/tooltip_corner.svg @@ -0,0 +1,69 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + +