summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-02-11 14:36:10 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-02-11 14:36:10 +0000
commit073cb0e61c16d3839a35aa4e8d7d14537ef8cc4e (patch)
treee68ba1638d6911ccc834f5fc0bc8de1ba03c0e02
parent377c99635872da365388f434ad7cb4824fe78175 (diff)
backport e_layout frozen state fix
SVN revision: 83828
-rw-r--r--ChangeLog1
-rw-r--r--NEWS1
-rw-r--r--src/bin/e_layout.c6
3 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 7470f468c..7c7bfea4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
2 2
3 * fixed bug where pointer warping to new clients would start at a random location 3 * fixed bug where pointer warping to new clients would start at a random location
4 * fix crash when locking screen from Start gadget and then activating gadget again 4 * fix crash when locking screen from Start gadget and then activating gadget again
5 * fixed bug where e_layout would ignore frozen state and crash
5 6
62013-02-08 Cedric Bail 72013-02-08 Cedric Bail
7 8
diff --git a/NEWS b/NEWS
index ad28cbb5a..387ea311c 100644
--- a/NEWS
+++ b/NEWS
@@ -33,6 +33,7 @@ Fixes:
33 * don't call efreet_menu_parse from a thread 33 * don't call efreet_menu_parse from a thread
34 * fixed bug where pointer warping to new clients would start at a random location 34 * fixed bug where pointer warping to new clients would start at a random location
35 * fix crash when locking screen from Start gadget and then activating gadget again 35 * fix crash when locking screen from Start gadget and then activating gadget again
36 * fixed bug where e_layout would ignore frozen state and crash
36 37
37 38
38Changes since 0.17.0: 39Changes since 0.17.0:
diff --git a/src/bin/e_layout.c b/src/bin/e_layout.c
index 837100da5..43008378d 100644
--- a/src/bin/e_layout.c
+++ b/src/bin/e_layout.c
@@ -151,7 +151,7 @@ e_layout_child_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
151 if ((li->x == x) && (li->y == y)) return; 151 if ((li->x == x) && (li->y == y)) return;
152 li->x = x; 152 li->x = x;
153 li->y = y; 153 li->y = y;
154 _e_layout_smart_move_resize_item(li); 154 if (li->sd->frozen <= 0) _e_layout_smart_move_resize_item(li);
155} 155}
156 156
157EAPI void 157EAPI void
@@ -166,7 +166,7 @@ e_layout_child_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
166 if ((li->w == w) && (li->h == h)) return; 166 if ((li->w == w) && (li->h == h)) return;
167 li->w = w; 167 li->w = w;
168 li->h = h; 168 li->h = h;
169 _e_layout_smart_move_resize_item(li); 169 if (li->sd->frozen <= 0) _e_layout_smart_move_resize_item(li);
170} 170}
171 171
172EAPI void 172EAPI void
@@ -452,7 +452,7 @@ _e_layout_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
452 sd->w = w; 452 sd->w = w;
453 sd->h = h; 453 sd->h = h;
454 sd->changed = 1; 454 sd->changed = 1;
455 _e_layout_smart_reconfigure(sd); 455 if (sd->frozen <= 0) _e_layout_smart_reconfigure(sd);
456} 456}
457 457
458static void 458static void