From 9d58b52c0b6b4e61f853d774fa3b9d9bb17a7251 Mon Sep 17 00:00:00 2001
From: rephorm <rephorm>
Date: Fri, 13 Oct 2006 02:49:40 +0000
Subject: [PATCH] Fix bug: overlap in deskpreview with a single desktop move
 color well default min size from theme into the widget itself (may still need
 to be tweaked a bit -- but can always be overridden when using the widget)

SVN revision: 26565
---
 TODO                                | 1 -
 data/themes/default_color_well.edc  | 1 -
 data/themes/default_deskpreview.edc | 2 +-
 src/bin/e_widget_color_well.c       | 3 +--
 src/bin/e_widget_desk_preview.c     | 4 ++--
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/TODO b/TODO
index b864958bd..882a5e632 100644
--- a/TODO
+++ b/TODO
@@ -16,7 +16,6 @@ Some of the things (in very short form) that need to be done to E17...
 * BUG: "match this window only" doesnt fall back to other unused remembers
 * BUG: xdaliclock -transparent doesnt use shaped border (not handling shape
   change later)
-* BUG: Virtual desks preview widget overlaps the sliders when desk counts are 1
 ]]]
 
 [[[
diff --git a/data/themes/default_color_well.edc b/data/themes/default_color_well.edc
index a817de678..78374a896 100644
--- a/data/themes/default_color_well.edc
+++ b/data/themes/default_color_well.edc
@@ -11,7 +11,6 @@ group {
 	 mouse_events:  0;
 	 description {
 	    state:    "default" 0.0;
-            min: 50 50;
 	    rel1 {
 	       to:       "overlay";
 	    }
diff --git a/data/themes/default_deskpreview.edc b/data/themes/default_deskpreview.edc
index 36f52a909..a95137002 100644
--- a/data/themes/default_deskpreview.edc
+++ b/data/themes/default_deskpreview.edc
@@ -39,7 +39,7 @@ group {
 	 }
       }
       part {
-	 name:          "e.swallow.desk";
+	 name:          "e.swallow.content";
 	 mouse_events:  0;
 	 type:          SWALLOW;
 	 clip_to:       "clip";
diff --git a/src/bin/e_widget_color_well.c b/src/bin/e_widget_color_well.c
index 020f5baa6..3eb0f5799 100644
--- a/src/bin/e_widget_color_well.c
+++ b/src/bin/e_widget_color_well.c
@@ -139,8 +139,7 @@ e_widget_color_well_add(Evas *evas, E_Color *color, int show_color_dialog)
    evas_object_show(o); 
    wd->o_edje = o;
 
-   edje_object_size_min_calc(o, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_min_size_set(obj, 50, 50);
 
    o = evas_object_rectangle_add(evas);
    e_widget_sub_object_add(obj, o);
diff --git a/src/bin/e_widget_desk_preview.c b/src/bin/e_widget_desk_preview.c
index 9e7ec584a..a28fb7fd9 100644
--- a/src/bin/e_widget_desk_preview.c
+++ b/src/bin/e_widget_desk_preview.c
@@ -92,7 +92,7 @@ e_widget_desk_preview_num_desks_set(Evas_Object *obj, int nx, int ny)
    e_widget_aspect_child_set(wd->aspect, o); 
    wd->table = o;
 
-   evas_object_geometry_get(wd->aspect, NULL, NULL, &aw, &ah);
+   evas_object_geometry_get(wd->table, NULL, NULL, &aw, &ah);
 
    if (ny > nx)
      {
@@ -150,7 +150,7 @@ e_widget_desk_preview_num_desks_set(Evas_Object *obj, int nx, int ny)
 	     e_icon_fill_inside_set(o, 0);
 	     e_thumb_icon_file_set(o, bgfile, "e/desktop/background");
 	     e_thumb_icon_size_set(o, tw, th);
-	     edje_object_part_swallow(overlay, "e.swallow.desk", o);
+	     edje_object_part_swallow(overlay, "e.swallow.content", o);
 	     e_thumb_icon_begin(o);
 	     evas_object_show(o);
 	     e_widget_sub_object_add(dw, o);