From 13eaabd098a1c437beecf9255323c8bea7980168 Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Tue, 4 Sep 2012 20:39:45 -0300 Subject: [PATCH] theme: just have notification bar on tizen. export HAVE_TIZEN define to edje and use it to determine the size of the notification bar. also defines the bar to be 25px on sd theme. --- Makefile.am | 4 ++++ data/themes/default-hd.edc | 6 ++++++ data/themes/default-sd.edc | 6 ++++++ data/themes/includes/main.edc | 8 ++++---- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 6e30237..f0d4c38 100644 --- a/Makefile.am +++ b/Makefile.am @@ -113,6 +113,10 @@ EDJE_FLAGS_VERBOSE_0 = EDJE_FLAGS_VERBOSE_1 = -v EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V)) -id $(top_srcdir)/data/themes/images -fd $(top_srcdir)/data/fonts +if HAVE_TIZEN +EDJE_FLAGS += -DHAVE_TIZEN=1 +endif + filesdir = $(pkgdatadir)/themes files_DATA = \ data/themes/default.edj \ diff --git a/data/themes/default-hd.edc b/data/themes/default-hd.edc index 0df8b40..2f48667 100644 --- a/data/themes/default-hd.edc +++ b/data/themes/default-hd.edc @@ -33,4 +33,10 @@ #define LOADING_SIZE 128 +#ifdef HAVE_TIZEN +#define NOTIFICATION_BAR_HEIGHT 50 +#else +#define NOTIFICATION_BAR_HEIGHT 0 +#endif + #include "default.edc" diff --git a/data/themes/default-sd.edc b/data/themes/default-sd.edc index 5045d8d..8ed28a6 100644 --- a/data/themes/default-sd.edc +++ b/data/themes/default-sd.edc @@ -33,4 +33,10 @@ #define LOADING_SIZE 64 +#ifdef HAVE_TIZEN +#define NOTIFICATION_BAR_HEIGHT 25 +#else +#define NOTIFICATION_BAR_HEIGHT 0 +#endif + #include "default.edc" diff --git a/data/themes/includes/main.edc b/data/themes/includes/main.edc index 6d1279f..fb52f02 100644 --- a/data/themes/includes/main.edc +++ b/data/themes/includes/main.edc @@ -44,7 +44,7 @@ group { } part { - name: "notification,bar"; + name: "notification.bar"; type: RECT; mouse_events: 0; description { @@ -53,7 +53,7 @@ group { rel1.relative: 0.0 0.0; rel2 { relative: 1.0 0.0; - offset: 0 50; + offset: -1 NOTIFICATION_BAR_HEIGHT; } } } @@ -69,12 +69,12 @@ group { fixed: 1 1; visible: 1; rel1 { - to: "notification,bar"; + to: "notification.bar"; relative: 0.0 1.0; offset: 0 0; } rel2 { - to: "notification,bar"; + to: "notification.bar"; relative: 1.0 1.0; offset: 0 0; } -- 2.7.4