yakov pushed a commit to branch master.
http://git.enlightenment.org/tools/erigo.git/commit/?id=e9efa825c4d910b8eadcc87b008aab06151519f2
commit e9efa825c4d910b8eadcc87b008aab06151519f2
Author: Yakov Goldberg <yako...@samsung.com>
Date: Tue Apr 14 15:14:06 2015 +0300
Fix selection border's coords
---
src/bin/egui_gui/editor.c | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/bin/egui_gui/editor.c b/src/bin/egui_gui/editor.c
index 64d68b1..054cc67 100644
--- a/src/bin/egui_gui/editor.c
+++ b/src/bin/egui_gui/editor.c
@@ -311,8 +311,8 @@ _wdg_border_draw(const Gui_Widget *wdg, Eina_Bool
visibility, int border_type_co
if (ow < minw) ow = minw;
if (oh < minh) oh = minh;
- lw = ow + 2;
- lh = oh + 2;
+ lw = ow;
+ lh = oh;
/* Redraw border only if coords or object were changed. */
if ((obj != prev_obj) || (ox != prev_ox) || (oy != prev_oy) ||
(ow != prev_ow) || (oh != prev_oh) || (prev_visibility !=
visibility))
@@ -334,28 +334,28 @@ _wdg_border_draw(const Gui_Widget *wdg, Eina_Bool
visibility, int border_type_co
{
case BORDER_SELECTION:
{
- LINE(base_obj, BORDER_TOP, BORDER_SELECTION, ox - 1, oy - 1, lw,
1, visibility);
- LINE(base_obj, BORDER_BOTTOM, BORDER_SELECTION, ox - 1, oy + oh
+ 1, lw, 1, visibility);
- LINE(base_obj, BORDER_RIGHT, BORDER_SELECTION, ox + ow + 1, oy -
1, 1, lh, visibility);
- LINE(base_obj, BORDER_LEFT, BORDER_SELECTION, ox - 1, oy - 1, 1,
lh, visibility);
+ LINE(base_obj, BORDER_TOP, BORDER_SELECTION, ox, oy - 1, lw, 1,
visibility);
+ LINE(base_obj, BORDER_BOTTOM, BORDER_SELECTION, ox, oy + oh - 1,
lw, 1, visibility);
+ LINE(base_obj, BORDER_RIGHT, BORDER_SELECTION, ox + ow - 1, oy -
1, 1, lh, visibility);
+ LINE(base_obj, BORDER_LEFT, BORDER_SELECTION, ox, oy, 1, lh,
visibility);
- MARKER(base_obj, BORDER_MARKER_TOP_LEFT, ox - 1 - hs - 1, oy - 1
- hs - 1, visibility);
+ MARKER(base_obj, BORDER_MARKER_TOP_LEFT, ox - 1 - hs, oy - 1 -
hs - 1, visibility);
MARKER(base_obj, BORDER_MARKER_TOP, ox + ow / 2 - hs / 2, oy - 1
- hs - 1, visibility);
- MARKER(base_obj, BORDER_MARKER_TOP_RIGHT, ox + ow + 1, oy - 1 -
hs - 1, visibility);
- MARKER(base_obj, BORDER_MARKER_RIGHT, ox + ow + 1, oy + oh / 2 -
hs / 2, visibility);
- MARKER(base_obj, BORDER_MARKER_BOTTOM_RIGHT, ox + ow + 1, oy +
oh + 1, visibility);
- MARKER(base_obj, BORDER_MARKER_BOTTOM, ox + ow / 2 - hs / 2, oy
+ oh + 1, visibility);
- MARKER(base_obj, BORDER_MARKER_BOTTOM_LEFT, ox - 1 - hs - 1, oy
+ oh + 1, visibility);
- MARKER(base_obj, BORDER_MARKER_LEFT, ox - 1 - hs - 1 , oy + oh /
2 - hs / 2, visibility);
+ MARKER(base_obj, BORDER_MARKER_TOP_RIGHT, ox + ow, oy - 1 - hs -
1, visibility);
+ MARKER(base_obj, BORDER_MARKER_RIGHT, ox + ow, oy + oh / 2 - hs
/ 2, visibility);
+ MARKER(base_obj, BORDER_MARKER_BOTTOM_RIGHT, ox + ow - 1, oy +
oh - 1, visibility);
+ MARKER(base_obj, BORDER_MARKER_BOTTOM, ox + ow / 2 - hs / 2, oy
+ oh, visibility);
+ MARKER(base_obj, BORDER_MARKER_BOTTOM_LEFT, ox - 1 - hs, oy +
oh, visibility);
+ MARKER(base_obj, BORDER_MARKER_LEFT, ox - 1 - hs, oy + oh / 2 -
hs / 2, visibility);
break;
}
case BORDER_DROP_TARGET:
{
- LINE(base_obj, BORDER_TOP, BORDER_DROP_TARGET, ox - 1, oy - 1,
lw, 1, visibility);
- LINE(base_obj, BORDER_BOTTOM, BORDER_DROP_TARGET, ox - 1, oy +
oh + 1, lw, 1, visibility);
- LINE(base_obj, BORDER_RIGHT, BORDER_DROP_TARGET, ox + ow + 1, oy
- 1, 1, lh, visibility);
- LINE(base_obj, BORDER_LEFT, BORDER_DROP_TARGET, ox - 1, oy - 1,
1, lh, visibility);
+ LINE(base_obj, BORDER_TOP, BORDER_DROP_TARGET, ox, oy - 1, lw,
1, visibility);
+ LINE(base_obj, BORDER_BOTTOM, BORDER_DROP_TARGET, ox, oy + oh -
1, lw, 1, visibility);
+ LINE(base_obj, BORDER_RIGHT, BORDER_DROP_TARGET, ox + ow - 1, oy
- 1, 1, lh, visibility);
+ LINE(base_obj, BORDER_LEFT, BORDER_DROP_TARGET, ox, oy, 1, lh,
visibility);
break;
}
}
--
