summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorzmike <michael.blumenkrantz@gmail.com>2014-04-28 11:00:54 -0400
committerzmike <michael.blumenkrantz@gmail.com>2014-04-28 11:01:20 -0400
commit595e0ca8280192f51554efafb5a54f476406e142 (patch)
tree7f9508f1ae7e2333709c9e6543e6a8771fe8e116 /src/lib
parent8b0c2eb207f71d43d6396d0327514e9840ba2d7e (diff)
ctxpopup should not blindly show arrows when they are not wanted by the theme
@fix
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/elc_ctxpopup.c34
1 files changed, 22 insertions, 12 deletions
diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index 9eb87bd4c..b118bc1b4 100644
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -392,10 +392,13 @@ _arrow_update(Evas_Object *obj,
392 { 392 {
393 case ELM_CTXPOPUP_DIRECTION_RIGHT: 393 case ELM_CTXPOPUP_DIRECTION_RIGHT:
394 edje_object_signal_emit(sd->arrow, "elm,state,left", "elm"); 394 edje_object_signal_emit(sd->arrow, "elm,state,left", "elm");
395 edje_object_part_swallow 395 if (!edje_object_part_swallow(wd->resize_obj,
396 (wd->resize_obj,
397 (elm_widget_mirrored_get(obj) ? "elm.swallow.arrow_right" : 396 (elm_widget_mirrored_get(obj) ? "elm.swallow.arrow_right" :
398 "elm.swallow.arrow_left"), sd->arrow); 397 "elm.swallow.arrow_left"), sd->arrow))
398 {
399 evas_object_hide(sd->arrow);
400 break;
401 }
399 402
400 if (base_size.h > 0) 403 if (base_size.h > 0)
401 { 404 {
@@ -415,10 +418,13 @@ _arrow_update(Evas_Object *obj,
415 418
416 case ELM_CTXPOPUP_DIRECTION_LEFT: 419 case ELM_CTXPOPUP_DIRECTION_LEFT:
417 edje_object_signal_emit(sd->arrow, "elm,state,right", "elm"); 420 edje_object_signal_emit(sd->arrow, "elm,state,right", "elm");
418 edje_object_part_swallow 421 if (!edje_object_part_swallow(wd->resize_obj,
419 (wd->resize_obj,
420 (elm_widget_mirrored_get(obj) ? "elm.swallow.arrow_left" : 422 (elm_widget_mirrored_get(obj) ? "elm.swallow.arrow_left" :
421 "elm.swallow.arrow_right"), sd->arrow); 423 "elm.swallow.arrow_right"), sd->arrow))
424 {
425 evas_object_hide(sd->arrow);
426 break;
427 }
422 428
423 if (base_size.h > 0) 429 if (base_size.h > 0)
424 { 430 {
@@ -438,9 +444,11 @@ _arrow_update(Evas_Object *obj,
438 444
439 case ELM_CTXPOPUP_DIRECTION_DOWN: 445 case ELM_CTXPOPUP_DIRECTION_DOWN:
440 edje_object_signal_emit(sd->arrow, "elm,state,top", "elm"); 446 edje_object_signal_emit(sd->arrow, "elm,state,top", "elm");
441 edje_object_part_swallow 447 if (!edje_object_part_swallow(wd->resize_obj, "elm.swallow.arrow_up", sd->arrow))
442 (wd->resize_obj, "elm.swallow.arrow_up", 448 {
443 sd->arrow); 449 evas_object_hide(sd->arrow);
450 break;
451 }
444 452
445 if (base_size.w > 0) 453 if (base_size.w > 0)
446 { 454 {
@@ -459,9 +467,11 @@ _arrow_update(Evas_Object *obj,
459 467
460 case ELM_CTXPOPUP_DIRECTION_UP: 468 case ELM_CTXPOPUP_DIRECTION_UP:
461 edje_object_signal_emit(sd->arrow, "elm,state,bottom", "elm"); 469 edje_object_signal_emit(sd->arrow, "elm,state,bottom", "elm");
462 edje_object_part_swallow 470 if (!edje_object_part_swallow(wd->resize_obj, "elm.swallow.arrow_down", sd->arrow))
463 (wd->resize_obj, "elm.swallow.arrow_down", 471 {
464 sd->arrow); 472 evas_object_hide(sd->arrow);
473 break;
474 }
465 475
466 if (base_size.w > 0) 476 if (base_size.w > 0)
467 { 477 {