summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSungtaek Hong <sth253.hong@samsung.com>2017-03-27 06:20:04 (GMT)
committerSungtaek Hong <sth253.hong@samsung.com>2017-04-03 06:24:00 (GMT)
commit916235c0d72bb62968a85ee6b9a8045e595c3b64 (patch)
tree153e9fc3d367597af253e5b68a0a462edc5cdb35
parent856c5b7ca3c11a81df87d267cd289c130a39d5f3 (diff)
downloadefl-theme-tizen-mobile-916235c0d72bb62968a85ee6b9a8045e595c3b64.zip
efl-theme-tizen-mobile-916235c0d72bb62968a85ee6b9a8045e595c3b64.tar.gz
efl-theme-tizen-mobile-916235c0d72bb62968a85ee6b9a8045e595c3b64.tar.bz2
Colorselector: merge csharp propertyrefs/changes/52/121052/6
Conflicts: mobile/color_classes_csharp.edc mobile/elm-sharp-theme-mobile.edc Change-Id: I74d0c5e51e50d077e7893c7219a56b852d992eb6 Signed-off-by: Sungtaek Hong <sth253.hong@samsung.com>
-rw-r--r--mobile/color_classes.edc3
-rw-r--r--mobile/color_classes_csharp.edc7
-rw-r--r--mobile/elm-sharp-theme-mobile.edc1
-rw-r--r--mobile/widgets/colorselector.edc7
-rw-r--r--mobile/widgets_csharp/colorselector.edc91
5 files changed, 10 insertions, 99 deletions
diff --git a/mobile/color_classes.edc b/mobile/color_classes.edc
index 1d7b120..91f1a24 100644
--- a/mobile/color_classes.edc
+++ b/mobile/color_classes.edc
@@ -551,6 +551,9 @@ color_classes {
color_class { "color_item/default/icon_selected";
color: 250 250 250 255;
}
+ color_class { "colorselector/default/bg";
+ color: 0 0 0 0;
+ }
/*
* Ctxpopup
diff --git a/mobile/color_classes_csharp.edc b/mobile/color_classes_csharp.edc
index 8b7c3f0..16c8cfa 100644
--- a/mobile/color_classes_csharp.edc
+++ b/mobile/color_classes_csharp.edc
@@ -108,13 +108,6 @@ color_classes {
color: 0 0 0 77;
}
/*
- * Colorselector
- */
- color_class {
- name: "colorselector/default/bg";
- color: 250 250 250 255;
- }
- /*
* Entry
*/
color_class { "entry/default/text_edit";
diff --git a/mobile/elm-sharp-theme-mobile.edc b/mobile/elm-sharp-theme-mobile.edc
index ab45189..358e2da 100644
--- a/mobile/elm-sharp-theme-mobile.edc
+++ b/mobile/elm-sharp-theme-mobile.edc
@@ -84,7 +84,6 @@ collections {
#include "color_classes_csharp.edc"
#include "widgets_csharp/button.edc"
-#include "widgets_csharp/colorselector.edc"
#include "widgets_csharp/entry.edc"
#include "widgets_csharp/genlist.edc"
#include "widgets_csharp/label.edc"
diff --git a/mobile/widgets/colorselector.edc b/mobile/widgets/colorselector.edc
index a8fc307..41a82cb 100644
--- a/mobile/widgets/colorselector.edc
+++ b/mobile/widgets/colorselector.edc
@@ -126,6 +126,13 @@ group { "elm/colorselector/palette/colorplane";
max: -1 -1;
}
}
+ rect { "bg";
+ nomouse;
+ desc { "default";
+ rel.to: "base";
+ color_class: "colorselector/default/bg";
+ }
+ }
spacer { "padding_top";
scale;
desc { "default";
diff --git a/mobile/widgets_csharp/colorselector.edc b/mobile/widgets_csharp/colorselector.edc
deleted file mode 100644
index 4ac5725..0000000
--- a/mobile/widgets_csharp/colorselector.edc
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved
- *
- * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-group { "elm/colorselector/palette/colorplane";
- alias: "elm/colorselector/palette/default";
- data.item: "horizontal_pad" COLORSELECTOR_PORTRAIT_HOR_PAD_COLORPLANE_INC;
- data.item: "vertical_pad" COLORSELECTOR_PORTRAIT_VER_PAD_COLORPLANE_INC;
-
- parts {
- spacer { "base";
- scale;
- desc { "default";
- min: COLORSELECTOR_PALETTE_COLORPLANE_WIDTH_INC COLORSELECTOR_PALETTE_COLORPLANE_HEIGHT_INC;
- max: -1 -1;
- }
- }
- rect { "bg";
- nomouse;
- desc { "default";
- rel.to: "base";
- color_class: "colorselector/default/bg";
- }
- }
- spacer { "padding_top";
- scale;
- desc { "default";
- min: 0 COLORSELECTOR_TOPBOTTOM_PAD_COLORPLANE_INC;
- fixed: 0 1;
- rel1 {
- relative: 0.0 0.0;
- to: "base";
- }
- rel2 {
- relative: 1.0 0.0;
- to: "base";
- }
- align: 0.0 0.0;
- }
- }
- swallow { "palette";
- scale;
- mouse;
- desc { state: "default";
- align: 0.5 0.0;
- fixed: 0 1;
- rel1 {
- relative: 0.0 1.0;
- to_y: "padding_top";
- }
- rel2.to_y: "padding_top";
- }
- }
- spacer { "padding_palette";
- scale;
- desc { "default";
- min: 0 COLORSELECTOR_TOPBOTTOM_PAD_COLORPLANE_INC;
- fixed: 0 1;
- rel1 {
- relative: 0.0 1.0;
- to: "palette";
- }
- rel2.to: "palette";
- align: 0.0 0.0;
- }
- }
- }
-}
-