summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael BOUCHAUD <michael.bouchaud@gmail.com>2012-11-22 11:08:01 +0000
committerMichael BOUCHAUD <michael.bouchaud@gmail.com>2012-11-22 11:08:01 +0000
commit625416efa506350e3d7e5e783f1fc8c4c400ae39 (patch)
tree0b33d48fd4a29a9e3bd0d617518f3b453296dd1d
parentd4e36a7dc239e052735fcbfed93c5a3e169b440b (diff)
elementary: backport fix flip, who show the two faces at same time
SVN revision: 79536
-rw-r--r--ChangeLog8
-rw-r--r--NEWS1
-rw-r--r--src/lib/elm_flip.c5
3 files changed, 8 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 2a9c8ab9e..10da731fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -519,10 +519,14 @@
519 519
520 * Fix wrong parameter for thumbnail error in elm_icon. 520 * Fix wrong parameter for thumbnail error in elm_icon.
521 521
5222012-10-25 Michael Bouchaud (yoz) 5222012-11-12 Michael Bouchaud (yoz)
523 523
524 * Add missing selected event in elm_index (elm_index_item_selected_set) 524 * Add missing selected event in elm_index (elm_index_item_selected_set)
525 525
5262012-11-14 Michael Bouchaud (yoz) 5262012-11-21 Michael Bouchaud (yoz)
527 527
528 * update the min size hint on elm_label after a text set 528 * update the min size hint on elm_label after a text set
529
5302012-11-22 Michael Bouchaud (yoz)
531
532 * fix elm_flip to show only one face at a time
diff --git a/NEWS b/NEWS
index eadbc54a5..4f820be9b 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ Fixes:
10 * Fix wrong parameter for thumbnail error in elm_icon. 10 * Fix wrong parameter for thumbnail error in elm_icon.
11 * Fix missing event selected in elm_index (elm_index_item_selected_set) 11 * Fix missing event selected in elm_index (elm_index_item_selected_set)
12 * Fix update the min size hint on elm_label after a text set 12 * Fix update the min size hint on elm_label after a text set
13 * Fix flip widget who show the two face at same time
13 14
14 15
15Changes since Elementary 1.7.0: 16Changes since Elementary 1.7.0:
diff --git a/src/lib/elm_flip.c b/src/lib/elm_flip.c
index 534eafde7..b20fe044e 100644
--- a/src/lib/elm_flip.c
+++ b/src/lib/elm_flip.c
@@ -873,10 +873,7 @@ _flip_show_hide(Evas_Object *obj)
873 } 873 }
874 else 874 else
875 { 875 {
876 if (sd->front.content) 876 evas_object_hide(sd->front.clip);
877 evas_object_show(sd->front.clip);
878 else
879 evas_object_hide(sd->front.clip);
880 if (sd->back.content) 877 if (sd->back.content)
881 evas_object_show(sd->back.clip); 878 evas_object_show(sd->back.clip);
882 else 879 else