From ebefa49e4bf578c8f4f119333f911a6188dd3c00 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 13 Oct 2016 11:25:27 -0400 Subject: [PATCH] do not check for shelf/bryce existence in opposing anchorages during bryce wizard fixes false positives when detecting positions --- src/bin/e_bryce_editor.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/bin/e_bryce_editor.c b/src/bin/e_bryce_editor.c index 1413346bc..8406f2c32 100644 --- a/src/bin/e_bryce_editor.c +++ b/src/bin/e_bryce_editor.c @@ -23,13 +23,17 @@ static void _editor_add_right(void *data, Evas_Object *obj, const char *sig, con static void setup_exists(Evas_Object *bryce, Evas_Object *editor, Evas_Object *parent, E_Gadget_Site_Anchor an) { - if (e_bryce_exists(parent, bryce, E_GADGET_SITE_ORIENT_HORIZONTAL, E_GADGET_SITE_ANCHOR_BOTTOM | an)) + if ((an != E_GADGET_SITE_ANCHOR_TOP) && + e_bryce_exists(parent, bryce, E_GADGET_SITE_ORIENT_HORIZONTAL, E_GADGET_SITE_ANCHOR_BOTTOM | an)) elm_object_signal_emit(editor, "e,bryce,exists,bottom", "e"); - if (e_bryce_exists(parent, bryce, E_GADGET_SITE_ORIENT_HORIZONTAL, E_GADGET_SITE_ANCHOR_TOP | an)) + if ((an != E_GADGET_SITE_ANCHOR_BOTTOM) && + e_bryce_exists(parent, bryce, E_GADGET_SITE_ORIENT_HORIZONTAL, E_GADGET_SITE_ANCHOR_TOP | an)) elm_object_signal_emit(editor, "e,bryce,exists,top", "e"); - if (e_bryce_exists(parent, bryce, E_GADGET_SITE_ORIENT_VERTICAL, E_GADGET_SITE_ANCHOR_LEFT | an)) + if ((an != E_GADGET_SITE_ANCHOR_RIGHT) && + e_bryce_exists(parent, bryce, E_GADGET_SITE_ORIENT_VERTICAL, E_GADGET_SITE_ANCHOR_LEFT | an)) elm_object_signal_emit(editor, "e,bryce,exists,left", "e"); - if (e_bryce_exists(parent, bryce, E_GADGET_SITE_ORIENT_VERTICAL, E_GADGET_SITE_ANCHOR_RIGHT | an)) + if ((an != E_GADGET_SITE_ANCHOR_LEFT) && + e_bryce_exists(parent, bryce, E_GADGET_SITE_ORIENT_VERTICAL, E_GADGET_SITE_ANCHOR_RIGHT | an)) elm_object_signal_emit(editor, "e,bryce,exists,right", "e"); }