elm/colorselector: Fix last compatibility problems on the theme.

Also remove a wrong call to set content on "selector", right after it
being set already.

diff --git a/data/themes/widgets/colorselector.edc b/data/themes/widgets/colorselector.edc
index 63ccd3724cd58e93ac6c63f1343ef3abfeaaf95c..7d4e0bca3ecc15ce6709eb6aecc2fbe371f64448 100644 (file)
--- a/data/themes/widgets/colorselector.edc
+++ b/data/themes/widgets/colorselector.edc
@@ -3,7 +3,7 @@ group { name: "elm/colorselector/palette/default";
    data.item: "horizontal_pad" "10";
    data.item: "vertical_pad" "10";
    parts {
-      part { name: "picker";
+      part { name: "elm.picker";
          type: SWALLOW;
          scale: 1;
          description { state: "default" 0.0;
@@ -20,8 +20,8 @@ group { name: "elm/colorselector/palette/default";
             min: 0 20;
             fixed: 0 1;
             rel1.relative: 0.0 1.0;
-            rel1.to: "picker";
-            rel2.to: "picker";
+            rel1.to: "elm.picker";
+            rel2.to: "elm.picker";
             align: 0.0 0.0;
          }
          description { state: "disabled" 0.0;

diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index ae030e92d60bae471731afe09c9511f7c751d1fa..3a5bebdb2e2cb70a824f17b0f567c9e707c18c8f 100644 (file)
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -1976,7 +1976,6 @@ _mode_set(Eo *obj, void *_pd, va_list *list)
           elm_layout_content_set(obj, "palette", sd->palette_box);
         if (!elm_layout_content_set(obj, "elm.selector", sd->col_bars_area))
           elm_layout_content_set(obj, "selector", sd->col_bars_area);
-        elm_layout_content_set(obj, "selector", sd->col_bars_area);
         elm_layout_signal_emit(obj, "elm,state,both", "elm");
         sd->focused = ELM_COLORSELECTOR_PALETTE;
         sd->selected = sd->items;