summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzmike <michael.blumenkrantz@gmail.com>2014-04-28 11:00:54 -0400
committerMike Blumenkrantz <zmike@samsung.com>2014-04-28 11:02:26 -0400
commit6f8189eb6cfcb381855457f4c42f45b8c3ff3c85 (patch)
tree95b14a48b5a02e9891400cfcc2c91b722d949f27
parent496bc6eace88db3a47615c3b846479e7398ec7c3 (diff)
ctxpopup should not blindly show arrows when they are not wanted by the theme
@fix
-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 812a97807..5219bb34c 100644
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -406,10 +406,13 @@ _arrow_update(Evas_Object *obj,
406 { 406 {
407 case ELM_CTXPOPUP_DIRECTION_RIGHT: 407 case ELM_CTXPOPUP_DIRECTION_RIGHT:
408 edje_object_signal_emit(sd->arrow, "elm,state,left", "elm"); 408 edje_object_signal_emit(sd->arrow, "elm,state,left", "elm");
409 edje_object_part_swallow 409 if (!edje_object_part_swallow(wd->resize_obj,
410 (wd->resize_obj,
411 (elm_widget_mirrored_get(obj) ? "elm.swallow.arrow_right" : 410 (elm_widget_mirrored_get(obj) ? "elm.swallow.arrow_right" :
412 "elm.swallow.arrow_left"), sd->arrow); 411 "elm.swallow.arrow_left"), sd->arrow))
412 {
413 evas_object_hide(sd->arrow);
414 break;
415 }
413 416
414 if (base_size.h > 0) 417 if (base_size.h > 0)
415 { 418 {
@@ -429,10 +432,13 @@ _arrow_update(Evas_Object *obj,
429 432
430 case ELM_CTXPOPUP_DIRECTION_LEFT: 433 case ELM_CTXPOPUP_DIRECTION_LEFT:
431 edje_object_signal_emit(sd->arrow, "elm,state,right", "elm"); 434 edje_object_signal_emit(sd->arrow, "elm,state,right", "elm");
432 edje_object_part_swallow 435 if (!edje_object_part_swallow(wd->resize_obj,
433 (wd->resize_obj,
434 (elm_widget_mirrored_get(obj) ? "elm.swallow.arrow_left" : 436 (elm_widget_mirrored_get(obj) ? "elm.swallow.arrow_left" :
435 "elm.swallow.arrow_right"), sd->arrow); 437 "elm.swallow.arrow_right"), sd->arrow))
438 {
439 evas_object_hide(sd->arrow);
440 break;
441 }
436 442
437 if (base_size.h > 0) 443 if (base_size.h > 0)
438 { 444 {
@@ -452,9 +458,11 @@ _arrow_update(Evas_Object *obj,
452 458
453 case ELM_CTXPOPUP_DIRECTION_DOWN: 459 case ELM_CTXPOPUP_DIRECTION_DOWN:
454 edje_object_signal_emit(sd->arrow, "elm,state,top", "elm"); 460 edje_object_signal_emit(sd->arrow, "elm,state,top", "elm");
455 edje_object_part_swallow 461 if (!edje_object_part_swallow(wd->resize_obj, "elm.swallow.arrow_up", sd->arrow))
456 (wd->resize_obj, "elm.swallow.arrow_up", 462 {
457 sd->arrow); 463 evas_object_hide(sd->arrow);
464 break;
465 }
458 466
459 if (base_size.w > 0) 467 if (base_size.w > 0)
460 { 468 {
@@ -473,9 +481,11 @@ _arrow_update(Evas_Object *obj,
473 481
474 case ELM_CTXPOPUP_DIRECTION_UP: 482 case ELM_CTXPOPUP_DIRECTION_UP:
475 edje_object_signal_emit(sd->arrow, "elm,state,bottom", "elm"); 483 edje_object_signal_emit(sd->arrow, "elm,state,bottom", "elm");
476 edje_object_part_swallow 484 if (!edje_object_part_swallow(wd->resize_obj, "elm.swallow.arrow_down", sd->arrow))
477 (wd->resize_obj, "elm.swallow.arrow_down", 485 {
478 sd->arrow); 486 evas_object_hide(sd->arrow);
487 break;
488 }
479 489
480 if (base_size.w > 0) 490 if (base_size.w > 0)
481 { 491 {