summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2013-12-09 07:26:33 -0500
committerMike Blumenkrantz <zmike@samsung.com>2013-12-09 07:26:33 -0500
commit400f966b70dbc3529bcf4a2188340e0b2dfe9d40 (patch)
treee19fa2bfd28c80308077785903d57ebad960c849 /src/modules
parent835a3dfac6c3b6ea209c71e8771467e65e956969 (diff)
improve efm popup display with multiple monitors
previously we'd clamp to the current screen, but that's not really necessary. also e_popup sucks, so trying to create zone-relative coords is not going to work -> just use first zone always
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/fileman/e_fwin.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c
index f43479cbb..ca7bf1651 100644
--- a/src/modules/fileman/e_fwin.c
+++ b/src/modules/fileman/e_fwin.c
@@ -819,8 +819,8 @@ _e_fwin_icon_popup(void *data)
819 y -= fwin->zone->y; 819 y -= fwin->zone->y;
820 } 820 }
821 else 821 else
822 fx = fwin->win->x, fy = fwin->win->y; 822 fx = fwin->win->border->x, fy = fwin->win->border->y;
823 fwin->popup = e_popup_new(zone, 0, 0, 1, 1); 823 fwin->popup = e_popup_new(eina_list_data_get(zone->container->zones), 0, 0, 1, 1);
824 e_popup_ignore_events_set(fwin->popup, 1); 824 e_popup_ignore_events_set(fwin->popup, 1);
825 825
826 bg = edje_object_add(fwin->popup->evas); 826 bg = edje_object_add(fwin->popup->evas);
@@ -850,7 +850,7 @@ _e_fwin_icon_popup(void *data)
850 /* if it's offscreen, try right of icon */ 850 /* if it's offscreen, try right of icon */
851 if (px < 0) px = (fx + x + w) + 3; 851 if (px < 0) px = (fx + x + w) + 3;
852 /* fuck this, stick it right on the icon */ 852 /* fuck this, stick it right on the icon */
853 if (px + mw + 3 > zone->w) 853 if ((px + mw + 3 > zone->x + zone->w) && (!e_zone_exists_direction(zone, E_ZONE_EDGE_RIGHT)))
854 px = (x + w / 2) - (mw / 2); 854 px = (x + w / 2) - (mw / 2);
855 /* give up */ 855 /* give up */
856 if (px < 0) px = 0; 856 if (px < 0) px = 0;
@@ -860,7 +860,7 @@ _e_fwin_icon_popup(void *data)
860 /* if it's offscreen, try below icon */ 860 /* if it's offscreen, try below icon */
861 if (py < 0) py = (fy + y + h) + 3; 861 if (py < 0) py = (fy + y + h) + 3;
862 /* fuck this, stick it right on the icon */ 862 /* fuck this, stick it right on the icon */
863 if (py + mh + 3 > zone->h) 863 if ((py + mh + 3 > zone->x + zone->h) && (!e_zone_exists_direction(zone, E_ZONE_EDGE_BOTTOM)))
864 py = (y + h / 2) - (mh / 2); 864 py = (y + h / 2) - (mh / 2);
865 /* give up */ 865 /* give up */
866 if (py < 0) py = 0; 866 if (py < 0) py = 0;