From d71ee52999d49166cc9c3a5cddb141e44fcde555 Mon Sep 17 00:00:00 2001 From: Radek Kintop Date: Mon, 8 May 2017 13:17:06 +0200 Subject: [PATCH] Custom popup styles no longer shadowing default system styles Change-Id: Ib4f346c61037fa2dd5717b2d19889f63d060994a Signed-off-by: Radek Kintop --- res/widget/popup.edc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/res/widget/popup.edc b/res/widget/popup.edc index ad9cc57..48bbfaa 100644 --- a/res/widget/popup.edc +++ b/res/widget/popup.edc @@ -403,7 +403,7 @@ NOTIFY_DEFAULT( "bottom_left", 0.0, 1.0); /* "elm/notify/bottom_left/popup/STYLE NOTIFY_DEFAULT("bottom_right", 1.0, 1.0); /* "elm/notify/bottom_right/popup/STYLE_POPUP" */ -group { "elm/notify/bottom/popup/function"; +group { "elm/notify/bottom/popup/custom_function"; nomouse; data.item: "hide_finished_signal" "on"; @@ -539,8 +539,8 @@ group { "elm/notify/bottom/popup/function"; } #define NOTIFY_FUNCTION(direction, align_x, align_y) \ -group { "elm/notify/"direction"/popup/function"; \ - alias: "elm/notify/"direction"/popup/toast"; \ +group { "elm/notify/"direction"/popup/custom_function"; \ + alias: "elm/notify/"direction"/popup/custom_toast"; \ inherit: "elm/notify/"direction"/popup/STYLE_POPUP"; \ nomouse; \ parts { \ @@ -568,7 +568,7 @@ NOTIFY_FUNCTION( "top_right", 1.0, 0.0); /* "elm/notify/top_right/popup/functi NOTIFY_FUNCTION( "bottom_left", 0.0, 1.0); /* "elm/notify/bottom_left/popup/function" */ NOTIFY_FUNCTION("bottom_right", 1.0, 1.0); /* "elm/notify/bottom_right/popup/function" */ -group { "elm/notify/center/popup/toast"; +group { "elm/notify/center/popup/custom_toast"; nomouse; data.item: "hide_finished_signal" "on"; @@ -765,7 +765,7 @@ group { "elm/notify/block_events/popup/STYLE_POPUP"; } } -group { "elm/notify/block_events/popup/function"; +group { "elm/notify/block_events/popup/custom_function"; inherit: "elm/notify/block_events/popup/STYLE_POPUP"; parts { @@ -798,8 +798,8 @@ group { "elm/notify/block_events/popup/function"; } -group { "elm/notify/block_events/popup/toast"; - inherit: "elm/notify/block_events/popup/function"; +group { "elm/notify/block_events/popup/custom_toast"; + inherit: "elm/notify/block_events/popup/custom_function"; program_remove: "show_animation"; program_remove: "on_hide"; @@ -824,7 +824,7 @@ group { "elm/notify/block_events/popup/toast"; // POPUP BASE -group { "elm/popup/base/default"; +group { "elm/popup/base/custom_default"; nomouse; images { @@ -1174,7 +1174,7 @@ group { "elm/popup/base/default"; } } -group { "elm/popup/base/function"; +group { "elm/popup/base/custom_function"; nomouse; images { @@ -1308,7 +1308,7 @@ group { "elm/popup/base/function"; } } -group { "elm/popup/base/toast"; +group { "elm/popup/base/custom_toast"; nomouse; images { @@ -1378,7 +1378,7 @@ group { "elm/popup/content/popup/STYLE_POPUP"; } } -group { "elm/popup/content/popup/function"; +group { "elm/popup/content/popup/custom_function"; parts{ swallow { "elm.swallow.content"; desc { "default"; @@ -1387,7 +1387,7 @@ group { "elm/popup/content/popup/function"; } } -group { "elm/popup/content/popup/toast"; +group { "elm/popup/content/popup/custom_toast"; parts{ swallow { "elm.swallow.content"; desc { "default"; @@ -1411,7 +1411,7 @@ group { "elm/label/base/popup/STYLE_POPUP"; } } -group { "elm/label/base/popup/toast"; +group { "elm/label/base/popup/custom_toast"; parts { textblock { "elm.text"; scale; -- 2.7.4