[EGIT] [core/efl] master 01/01: edje lua2: check string ptr before dereference
kimcinoo pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d5c8311470e398421d960bd6109051f5f59d2ea3
commit d5c8311470e398421d960bd6109051f5f59d2ea3
Author: Taehyub Kim
Date: Tue Nov 30 10:48:37 2021 +0900
edje lua2: check string ptr before dereference
Summary: fix null pointer dereference
Reviewers: Hermet, kimcinoo, jsuya, raster
Reviewed By: kimcinoo
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D12309
---
src/lib/edje/edje_lua2.c | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/lib/edje/edje_lua2.c b/src/lib/edje/edje_lua2.c
index 28e6667fda..1ea61e5ca0 100644
--- a/src/lib/edje/edje_lua2.c
+++ b/src/lib/edje/edje_lua2.c
@@ -491,12 +491,15 @@ _elua_scan_params(lua_State *L, int i, char *params, ...)
// Stack usage -
size_t len;
char *temp = (char *)lua_tolstring(L, j, &len); //
Stack usage [-0, +0, m]
- len++; // Cater for the null at the end.
- *v = malloc(len);
- if (*v)
+ if (temp)
{
-memcpy(*v, temp, len);
-n++;
+ len++; // Cater for the null at the end.
+ *v = malloc(len);
+ if (*v)
+ {
+memcpy(*v, temp, len);
+n++;
+ }
}
}
break;
--
[EGIT] [core/efl] master 01/01: efl_canvas_image : remove the animated image limitation
hermet pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=3b1eede582cd58b03e46ed35e96ed9cb358cd060 commit 3b1eede582cd58b03e46ed35e96ed9cb358cd060 Author: Taehyub Kim Date: Thu Nov 4 16:38:48 2021 +0900 efl_canvas_image : remove the animated image limitation Summary: remove FRAME_MAX limitation to play the huge animated image which has more than 1024 frames Test Plan: load gif image which has more than 1024 frames Reviewers: Hermet, kimcinoo Reviewed By: Hermet Subscribers: raster, cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D12303 --- src/lib/evas/canvas/efl_canvas_image.c | 3 +-- src/lib/evas/canvas/evas_image_private.h | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/lib/evas/canvas/efl_canvas_image.c b/src/lib/evas/canvas/efl_canvas_image.c index d78f1f675b..f4a8cb1f22 100644 --- a/src/lib/evas/canvas/efl_canvas_image.c +++ b/src/lib/evas/canvas/efl_canvas_image.c @@ -599,8 +599,7 @@ _evas_image_animated_frame_set(Eo *eo_obj, int frame_index) evas_object_async_block(obj); frame_count = evas_object_image_animated_frame_count_get(eo_obj); - /* limit the size of frame to FRAME_MAX */ - if ((frame_count > FRAME_MAX) || (frame_count < 0) || (frame_index > frame_count)) + if ((frame_count < 0) || (frame_index > frame_count)) return EINA_FALSE; if (!ENFN->image_animated_frame_set) return EINA_FALSE; diff --git a/src/lib/evas/canvas/evas_image_private.h b/src/lib/evas/canvas/evas_image_private.h index 693125fb84..fd71ad 100644 --- a/src/lib/evas/canvas/evas_image_private.h +++ b/src/lib/evas/canvas/evas_image_private.h @@ -254,6 +254,4 @@ void _evas_image_load(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, Evas EINA_COW_IMAGE_STATE_WRITE_END(Obj, cur_write); \ } -#define FRAME_MAX 1024 - #endif // EVAS_IMAGE_PRIVATE_H --
[EGIT] [core/efl] master 01/01: efl_ui_alert_popup: add title part in parts block
jaehyun pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e4e7ff3905090a75eb900672be7208f1f62fcf65
commit e4e7ff3905090a75eb900672be7208f1f62fcf65
Author: Taehyub Kim
Date: Thu Nov 7 13:38:47 2019 +0900
efl_ui_alert_popup: add title part in parts block
Summary: add title part in parts block
Reviewers: Jaehyun_Cho, woohyun, zmike, segfaultxavi
Reviewed By: Jaehyun_Cho
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D10596
---
src/lib/elementary/efl_ui_alert_popup.c| 38 ++
src/lib/elementary/efl_ui_alert_popup.eo | 3 ++
...up_part.eo => efl_ui_alert_popup_part_title.eo} | 2 +-
src/lib/elementary/meson.build | 2 +-
4 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/src/lib/elementary/efl_ui_alert_popup.c
b/src/lib/elementary/efl_ui_alert_popup.c
index 0c5fc1bbd9..65dcb4914c 100644
--- a/src/lib/elementary/efl_ui_alert_popup.c
+++ b/src/lib/elementary/efl_ui_alert_popup.c
@@ -8,7 +8,7 @@
#include "elm_priv.h"
#include "efl_ui_alert_popup_private.h"
-#include "efl_ui_alert_popup_part.eo.h"
+#include "efl_ui_alert_popup_part_title.eo.h"
#include "elm_part_helper.h"
#define MY_CLASS EFL_UI_ALERT_POPUP_CLASS
@@ -257,18 +257,42 @@ _efl_ui_alert_popup_efl_object_destructor(Eo *obj,
Efl_Ui_Alert_Popup_Data *pd)
}
static Eina_Bool
-_part_is_efl_ui_alert_popup_part(const Eo *obj, const char *part)
+_part_is_efl_ui_alert_popup_part_title(const Eo *obj, const char *part)
{
if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE)) return
EINA_FALSE;
return eina_streq(part, "efl.text.title");
}
/* Efl.Part begin */
-ELM_PART_OVERRIDE_PARTIAL(efl_ui_alert_popup, EFL_UI_ALERT_POPUP,
- Efl_Ui_Alert_Popup_Data,
_part_is_efl_ui_alert_popup_part)
-ELM_PART_OVERRIDE_TEXT_SET(efl_ui_alert_popup, EFL_UI_ALERT_POPUP,
Efl_Ui_Alert_Popup_Data)
-ELM_PART_OVERRIDE_TEXT_GET(efl_ui_alert_popup, EFL_UI_ALERT_POPUP,
Efl_Ui_Alert_Popup_Data)
-#include "efl_ui_alert_popup_part.eo.c"
+EOLIAN static Efl_Object *
+_efl_ui_alert_popup_efl_part_part_get(const Eo *obj, Efl_Ui_Alert_Popup_Data
*priv EINA_UNUSED, const char *part)
+{
+ EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL);
+ if (_part_is_efl_ui_alert_popup_part_title(obj, part))
+ return ELM_PART_IMPLEMENT(EFL_UI_ALERT_POPUP_PART_TITLE_CLASS, obj, part);
+ return efl_part_get(efl_super(obj, EFL_UI_ALERT_POPUP_CLASS), part);
+}
+
+EOLIAN static void
+_efl_ui_alert_popup_part_title_efl_text_text_set(Eo *obj, void *_pd
EINA_UNUSED, const char *text)
+{
+ Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
+ Efl_Ui_Alert_Popup_Data *sd = efl_data_scope_get(pd->obj,
EFL_UI_ALERT_POPUP_CLASS);
+
+ _efl_ui_alert_popup_text_set(pd->obj, sd, pd->part, text);
+}
+
+EOLIAN static const char*
+_efl_ui_alert_popup_part_title_efl_text_text_get(const Eo *obj, void *_pd
EINA_UNUSED)
+{
+ Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
+ Efl_Ui_Alert_Popup_Data *sd = efl_data_scope_get(pd->obj,
EFL_UI_ALERT_POPUP_CLASS);
+
+ return _efl_ui_alert_popup_text_get(pd->obj, sd, pd->part);
+}
+
+
+#include "efl_ui_alert_popup_part_title.eo.c"
/* Efl.Part end */
EFL_UI_LAYOUT_TEXT_ALIASES_IMPLEMENT(efl_ui_alert_popup)
diff --git a/src/lib/elementary/efl_ui_alert_popup.eo
b/src/lib/elementary/efl_ui_alert_popup.eo
index c154bb2746..b51fcb4658 100644
--- a/src/lib/elementary/efl_ui_alert_popup.eo
+++ b/src/lib/elementary/efl_ui_alert_popup.eo
@@ -45,6 +45,9 @@ class Efl.Ui.Alert_Popup extends Efl.Ui.Popup
}
}
}
+ parts {
+ title @beta: Efl.Ui.Alert_Popup_Part_Title; [[The title text of Alert
Popup.]]
+ }
implements {
Efl.Object.constructor;
Efl.Object.destructor;
diff --git a/src/lib/elementary/efl_ui_alert_popup_part.eo
b/src/lib/elementary/efl_ui_alert_popup_part_title.eo
similarity index 61%
rename from src/lib/elementary/efl_ui_alert_popup_part.eo
rename to src/lib/elementary/efl_ui_alert_popup_part_title.eo
index b5860a99ff..94a489933c 100644
--- a/src/lib/elementary/efl_ui_alert_popup_part.eo
+++ b/src/lib/elementary/efl_ui_alert_popup_part_title.eo
@@ -1,4 +1,4 @@
-class @beta Efl.Ui.Alert_Popup_Part extends Efl.Ui.Layout_Part_Text
+class @beta Efl.Ui.Alert_Popup_Part_Title extends Efl.Ui.Layout_Part_Text
{
[[Efl UI Alert Popup internal part class]]
data: null;
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index c2cd86bbc9..58c7fd3c09 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -83,7 +83,7 @@ pub_eo_files = [
'efl_ui_popup.eo',
'efl_ui_popup_part_backwall.eo',
[EGIT] [core/efl] master 01/01: elm_popup: calculate the label min size of popup before the popup group calculation
jaehyun pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=10a5d83e83e39b943aab6bca5e999e5862c6dcbd commit 10a5d83e83e39b943aab6bca5e999e5862c6dcbd Author: Taehyub Kim Date: Tue Sep 3 19:47:01 2019 +0900 elm_popup: calculate the label min size of popup before the popup group calculation Summary: consider the label min width size before the popup group calculation @fix Test Plan: 1. run elementary_test popup Reviewers: Jaehyun_Cho, woohyun Reviewed By: Jaehyun_Cho Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D9818 --- src/lib/elementary/elc_popup.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c index 8117d15b9b..df9e4e70e8 100644 --- a/src/lib/elementary/elc_popup.c +++ b/src/lib/elementary/elc_popup.c @@ -1039,8 +1039,11 @@ _content_text_set(Evas_Object *obj, evas_object_event_callback_add (sd->text_content_obj, EVAS_CALLBACK_DEL, _on_text_content_del, obj); - elm_label_line_wrap_set(sd->text_content_obj, sd->content_text_wrap_type); + elm_label_line_wrap_set(sd->text_content_obj, ELM_WRAP_NONE); elm_object_text_set(sd->text_content_obj, text); + efl_canvas_group_calculate(sd->text_content_obj); + elm_label_line_wrap_set(sd->text_content_obj, sd->content_text_wrap_type); + evas_object_size_hint_weight_set (sd->text_content_obj, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set --
[EGIT] [core/efl] master 01/01: Efl.Gfx.Hint_Align: add define values for Efl.Gfx.Hint_Align
xartigas pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e1e4f904464230460bcd12935529e45793901b09
commit e1e4f904464230460bcd12935529e45793901b09
Author: Taehyub Kim
Date: Fri Jul 26 09:02:01 2019 +0200
Efl.Gfx.Hint_Align: add define values for Efl.Gfx.Hint_Align
Summary:
Add define values for Efl.Gfx.Hint_Align
- Efl.Gfx.Hint_Align_Left
- Efl.Gfx.Hint_Align_Right
- Efl.Gfx.Hint_Align_Top
- Efl.Gfx.Hint_Align_Bottom
- Efl.Gfx.Hint_Align_Center
Reviewers: bu5hm4n, Jaehyun_Cho, woohyun, segfaultxavi
Reviewed By: segfaultxavi
Subscribers: segfaultxavi, cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D9413
---
src/lib/efl/interfaces/efl_gfx_hint.eo | 11 +++
1 file changed, 11 insertions(+)
diff --git a/src/lib/efl/interfaces/efl_gfx_hint.eo
b/src/lib/efl/interfaces/efl_gfx_hint.eo
index 08f521fcf4..286474f888 100644
--- a/src/lib/efl/interfaces/efl_gfx_hint.eo
+++ b/src/lib/efl/interfaces/efl_gfx_hint.eo
@@ -4,6 +4,17 @@ import efl_gfx_types;
const Efl.Gfx.Hint_Expand: double = 1.0;
[[Use with @Efl.Gfx.Hint.hint_weight.]]
+const Efl.Gfx.Hint_Align_Left: double = 0.0;
+ [[Use with @Efl.Gfx.Hint.hint_align.]]
+const Efl.Gfx.Hint_Align_Right: double = 1.0;
+ [[Use with @Efl.Gfx.Hint.hint_align.]]
+const Efl.Gfx.Hint_Align_Top: double = 0.0;
+ [[Use with @Efl.Gfx.Hint.hint_align.]]
+const Efl.Gfx.Hint_Align_Bottom: double = 1.0;
+ [[Use with @Efl.Gfx.Hint.hint_align.]]
+const Efl.Gfx.Hint_Align_Center: double = 0.5;
+ [[Use with @Efl.Gfx.Hint.hint_align.]]
+
interface Efl.Gfx.Hint
{
[[Efl graphics hint interface
--
[EGIT] [core/efl] master 01/01: efl_ui_format: add null checking codes for eina_strftime in _do_format_string function
kimcinoo pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d53e46d76f3eb4f3face03f1f39d0b4a9e7aece3
commit d53e46d76f3eb4f3face03f1f39d0b4a9e7aece3
Author: Taehyub Kim
Date: Mon Aug 26 14:50:44 2019 +0900
efl_ui_format: add null checking codes for eina_strftime in
_do_format_string function
Summary: efl_ui_format: add null checking codes for eina_strftime in
_do_format_string function
Reviewers: kimcinoo
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D9735
---
src/lib/elementary/efl_ui_format.c | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/lib/elementary/efl_ui_format.c
b/src/lib/elementary/efl_ui_format.c
index 2dff332409..7e3ce115d3 100644
--- a/src/lib/elementary/efl_ui_format.c
+++ b/src/lib/elementary/efl_ui_format.c
@@ -136,11 +136,14 @@ _do_format_string(Efl_Ui_Format_Data *pd, Eina_Strbuf
*str, const Eina_Value val
case FORMAT_TYPE_TM:
{
struct tm v;
-char *buf;
+char *buf = NULL;
eina_value_get(&value, &v);
buf = eina_strftime(pd->format_string, &v);
-eina_strbuf_append(str, buf);
-free(buf);
+if (buf)
+ {
+ eina_strbuf_append(str, buf);
+ free(buf);
+ }
break;
}
default:
--
[EGIT] [core/efl] master 01/01: efl_ui_layout_orientation: fix the bitwise condition logic
jaehyun pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=28adabd21481ea244a800b1a31c69271ad619d2d
commit 28adabd21481ea244a800b1a31c69271ad619d2d
Author: Taehyub Kim
Date: Tue Jun 4 20:14:03 2019 +0900
efl_ui_layout_orientation: fix the bitwise condition logic
Summary: fix the bitwise condition logic
Reviewers: Jaehyun_Cho, zmike
Reviewed By: Jaehyun_Cho
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D9067
---
src/lib/elementary/elm_priv.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index c8422bf5eb..6af1ae3744 100644
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -982,7 +982,7 @@
efl_ui_layout_orientation_axis_get(Efl_Ui_Layout_Orientation orient)
static inline Eina_Bool
efl_ui_layout_orientation_is_inverted(Efl_Ui_Layout_Orientation orient)
{
- return orient & EFL_UI_LAYOUT_ORIENTATION_INVERTED;
+ return ((orient & EFL_UI_LAYOUT_ORIENTATION_INVERTED) ==
EFL_UI_LAYOUT_ORIENTATION_INVERTED) ? EINA_TRUE : EINA_FALSE;
}
static inline Eina_Bool
--
[EGIT] [core/efl] master 11/12: win: implement efl_provider_find for EFL_UI_WIN_CLASS
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=94d3fd3d82564ead619c7eef1eaccd70968031b4
commit 94d3fd3d82564ead619c7eef1eaccd70968031b4
Author: Taehyub Kim
Date: Fri Jul 28 15:01:31 2017 +0900
win: implement efl_provider_find for EFL_UI_WIN_CLASS
Summary:
Implement efl_provider_find function for efl_ui_win class.
This will support to search window class by efl_provider_find function.
Reviewers: jpeg, cedric, Jaehyun_Cho, thiepha, woohyun, Blackmole
Reviewed By: jpeg, cedric
Differential Revision: https://phab.enlightenment.org/D5045
---
src/lib/elementary/efl_ui_win.c | 9 +
src/lib/elementary/efl_ui_win.eo | 1 +
2 files changed, 10 insertions(+)
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index e9ecc3c145..e37110db1b 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -6698,6 +6698,15 @@ _efl_ui_win_efl_input_state_lock_enabled_get(Eo *obj
EINA_UNUSED, Efl_Ui_Win_Dat
return evas_seat_key_lock_is_set(m, name, seat);
}
+EOLIAN static Efl_Object *
+_efl_ui_win_efl_object_provider_find(Eo *obj, Efl_Ui_Win_Data *pd EINA_UNUSED,
+ const Efl_Object *klass)
+{
+if (klass == EFL_UI_WIN_CLASS)
+ return obj;
+return efl_provider_find(efl_super(obj, MY_CLASS), klass);
+}
+
// See evas_inline.x
#define _EVAS_COLOR_CLAMP(x, y) do { \
if (x > y) { x = y; bad = 1; } \
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index 91863a848d..3f2806f7ef 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -972,6 +972,7 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas,
Elm.Interface.Atspi.Window,
Efl.Container.content { get; set; }
Efl.Container.content_unset;
Efl.Part.part;
+ Efl.Object.provider_find;
}
constructors {
.name;
--
[EGIT] [core/efl] master 01/01: efl_ui_image_zoomable: fix wrong initial value for zoom mode
ami pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e7b302d89fd4e145b997efb9dc6b4430b7c91a02
commit e7b302d89fd4e145b997efb9dc6b4430b7c91a02
Author: Taehyub Kim
Date: Tue May 30 20:33:16 2017 +0900
efl_ui_image_zoomable: fix wrong initial value for zoom mode
Summary:
fix wrong initial value for ELM_PHOTOCAM_ZOOM_MODE_AUTO_FILL mode
@fix
Test Plan:
1. set zoom mode of photocam to ELM_PHOTOCAM_ZOOM_MODE_AUTO_FILL in
text_photocam.c example
2. run elementary_test -to photocam
3. check it is working well
Reviewers: jpeg, cedric, raster, Hermet, singh.amitesh
Reviewed By: singh.amitesh
Differential Revision: https://phab.enlightenment.org/D4921
---
src/lib/elementary/efl_ui_image_zoomable.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/elementary/efl_ui_image_zoomable.c
b/src/lib/elementary/efl_ui_image_zoomable.c
index 8a93f6521f..ff1d944626 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -1944,7 +1944,7 @@ _efl_ui_image_zoomable_efl_ui_zoom_zoom_set(Eo *obj,
Efl_Ui_Image_Zoomable_Data
if ((sd->size.imw < 1) || (sd->size.imh < 1))
{
sd->size.nw = 0;
- sd->size.nw = 0;
+ sd->size.nh = 0;
}
else
{
--
[EGIT] [core/efl] master 01/03: popup: hides the popup when hide effect is finished
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=425a04beb375051cc4154fa70c0b3dc55091f786
commit 425a04beb375051cc4154fa70c0b3dc55091f786
Author: Taehyub Kim
Date: Thu Mar 9 16:36:20 2017 +0900
popup: hides the popup when hide effect is finished
Summary:
When popup hides and shows fast, sometimes popup is not shown
because of the difference visible value between popup and notify
(case: popup visible state: 1, popup_notify visible state: 0)
To sync this value I added the visible set code in elc_popup.c
@fix
Test Plan:
1. run elementary_text -to popup
2. shows the hide popup
3. hides popup using the hide button
4. repeat 2,3 step
5. popup will be shown well
Reviewers: jpeg, cedric, Hermet, raster
Subscribers: Blackmole, woohyun
Differential Revision: https://phab.enlightenment.org/D4710
---
src/lib/elementary/elc_popup.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index 2e49ceb..7fa35ad 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -119,6 +119,7 @@ static void
_hide_effect_finished_cb(void *data, const Efl_Event *event EINA_UNUSED)
{
efl_event_callback_legacy_call(data, ELM_POPUP_EVENT_DISMISSED, NULL);
+ efl_gfx_visible_set(data, EINA_FALSE);
}
--
[EGIT] [core/efl] master 01/01: ecore_wayland: fix over writing file descriptor bug for reading
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=3a98ee3796d7fe4bc70be99fc928dd3d89eddc4a
commit 3a98ee3796d7fe4bc70be99fc928dd3d89eddc4a
Author: Taehyub Kim
Date: Fri Nov 18 19:53:14 2016 +0900
ecore_wayland: fix over writing file descriptor bug for reading
Summary:
fix over writing file descriptor bug for reading.
when we paste data to entry very fast, source->fd is over wrote by latest
fd.
It cause blocking of read function since the read function use invalid fd.
so I make memorizing valid fd and using it in read function.
@fix
Reviewers: Hermet, jpeg, cedric, devilhorns, ManMower, raster
Differential Revision: https://phab.enlightenment.org/D4410
---
src/lib/ecore_wayland/ecore_wl_dnd.c | 25 -
1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/lib/ecore_wayland/ecore_wl_dnd.c
b/src/lib/ecore_wayland/ecore_wl_dnd.c
index c286624..f40eaf7 100644
--- a/src/lib/ecore_wayland/ecore_wl_dnd.c
+++ b/src/lib/ecore_wayland/ecore_wl_dnd.c
@@ -31,6 +31,12 @@
#include "ecore_wl_private.h"
/* local structures */
+struct _dnd_source
+{
+ Ecore_Wl_Dnd_Source *source;
+ int read_fd;
+};
+
struct _dnd_task
{
void *data;
@@ -615,6 +621,7 @@ _ecore_wl_dnd_selection_data_receive(Ecore_Wl_Dnd_Source
*source, const char *ty
struct epoll_event *ep = NULL;
struct _dnd_task *task = NULL;
struct _dnd_read_ctx *read_ctx = NULL;
+ struct _dnd_source *read_source = NULL;
int p[2];
LOGFN(__FILE__, __LINE__, __FUNCTION__);
@@ -640,7 +647,12 @@ _ecore_wl_dnd_selection_data_receive(Ecore_Wl_Dnd_Source
*source, const char *ty
epoll_fd = epoll_create1(0);
if (epoll_fd < 0) goto err;
- task->data = source;
+ read_source = calloc(1, sizeof(struct _dnd_source));
+ if (!read_source) goto err;
+
+ read_source = source;
+ read_source->read_fd = p[0];
+ task->data = read_source;
task->cb = _ecore_wl_dnd_selection_data_read;
ep->events = EPOLLIN;
ep->data.ptr = task;
@@ -653,7 +665,6 @@ _ecore_wl_dnd_selection_data_receive(Ecore_Wl_Dnd_Source
*source, const char *ty
if (!ecore_idler_add(_ecore_wl_dnd_selection_cb_idle, read_ctx)) goto err;
source->refcount++;
- source->fd = p[0];
return;
@@ -661,6 +672,7 @@ err:
if (ep) free(ep);
if (task) free(task);
if (read_ctx) free(read_ctx);
+ if (read_source) free(read_source);
close(p[0]);
return;
}
@@ -671,21 +683,23 @@ _ecore_wl_dnd_selection_data_read(void *data,
Ecore_Fd_Handler *fd_handler EINA_
int len;
char buffer[PATH_MAX];
Ecore_Wl_Dnd_Source *source;
+ struct _dnd_source *read_source;
Ecore_Wl_Event_Selection_Data_Ready *event;
Eina_Bool ret;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
- source = data;
+ read_source = data;
+ source = read_source->source;
- len = read(source->fd, buffer, sizeof buffer);
+ len = read(read_source->read_fd, buffer, sizeof buffer);
if (!(event = calloc(1, sizeof(Ecore_Wl_Event_Selection_Data_Ready
return ECORE_CALLBACK_CANCEL;
if (len <= 0)
{
-close(source->fd);
+close(read_source->read_fd);
_ecore_wl_dnd_del(source);
event->done = EINA_TRUE;
event->data = NULL;
@@ -742,6 +756,7 @@ _ecore_wl_dnd_selection_cb_idle(void *data)
if (task->cb(task->data, NULL) == ECORE_CALLBACK_CANCEL)
{
free(ctx->ep);
+ free(task->data);
free(task);
free(ctx);
return ECORE_CALLBACK_CANCEL;
--
[EGIT] [core/efl] master 02/06: elementary: colorselector - apply new focus ui for palette and components items
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ee83f2aa3d6a089487b97c3f9cdad30a0cb5a9d8
commit ee83f2aa3d6a089487b97c3f9cdad30a0cb5a9d8
Author: Taehyub Kim
Date: Tue Oct 25 13:32:50 2016 -0700
elementary: colorselector - apply new focus ui for palette and components
items
Summary:
colorselector focus ui is not moving for palette and components items.
now it is changed to focus each item of palette and components.
Test Plan:
1. build efl elementary with this patch
2. remove /home/{user}/.elementary
3. launch colorselector with elementary_test -to colorselector
4. move direction key
5. see the new focus ui
Reviewers: jpeg, raster, Hermet, woohyun, bu5hm4n, cedric
Reviewed By: cedric
Differential Revision: https://phab.enlightenment.org/D4288
Signed-off-by: Cedric Bail
---
config/default/base.src.in| 6 ++
config/mobile/base.src.in | 6 ++
config/standard/base.src.in | 6 ++
src/lib/elementary/elm_color_item.eo | 2 +
src/lib/elementary/elm_colorselector.c| 100 ++
src/lib/elementary/elm_colorselector.eo | 1 +
src/lib/elementary/elm_widget_colorselector.h | 4 ++
7 files changed, 110 insertions(+), 15 deletions(-)
diff --git a/config/default/base.src.in b/config/default/base.src.in
index 9e05df6..90188f3 100644
--- a/config/default/base.src.in
+++ b/config/default/base.src.in
@@ -803,6 +803,12 @@ group "Elm_Config" struct {
value "action" string: "move";
value "params" string: "down";
}
+ group "Elm_Config_Binding_Key" struct {
+ value "context" int: 0;
+ value "key" string: "Return";
+ value "action" string: "activate";
+ value "params" string: "";
+ }
}
}
group "Elm_Config_Bindings_Widget" struct {
diff --git a/config/mobile/base.src.in b/config/mobile/base.src.in
index 56c4f3f..5619970 100644
--- a/config/mobile/base.src.in
+++ b/config/mobile/base.src.in
@@ -807,6 +807,12 @@ group "Elm_Config" struct {
value "action" string: "move";
value "params" string: "down";
}
+ group "Elm_Config_Binding_Key" struct {
+ value "context" int: 0;
+ value "key" string: "Return";
+ value "action" string: "activate";
+ value "params" string: "";
+ }
}
}
group "Elm_Config_Bindings_Widget" struct {
diff --git a/config/standard/base.src.in b/config/standard/base.src.in
index e628f82..849185f 100644
--- a/config/standard/base.src.in
+++ b/config/standard/base.src.in
@@ -804,6 +804,12 @@ group "Elm_Config" struct {
value "action" string: "move";
value "params" string: "down";
}
+ group "Elm_Config_Binding_Key" struct {
+ value "context" int: 0;
+ value "key" string: "Return";
+ value "action" string: "activate";
+ value "params" string: "";
+ }
}
}
group "Elm_Config_Bindings_Widget" struct {
diff --git a/src/lib/elementary/elm_color_item.eo
b/src/lib/elementary/elm_color_item.eo
index eab8b54..00928c3 100644
--- a/src/lib/elementary/elm_color_item.eo
+++ b/src/lib/elementary/elm_color_item.eo
@@ -40,5 +40,7 @@ class Elm.Color.Item(Elm.Widget.Item)
Efl.Object.destructor;
Elm.Widget.Item.access_register;
Elm.Widget.Item.signal_emit;
+ Elm.Widget.Item.focus.set;
+ Elm.Widget.Item.focus.get;
}
}
diff --git a/src/lib/elementary/elm_colorselector.c
b/src/lib/elementary/elm_colorselector.c
index 189d341..66af2e2 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -183,9 +183,11 @@ static const Elm_Color_Name _color_name[] = {
};
static Eina_Bool _key_action_move(Evas_Object *obj, const char *params);
+static Eina_Bool _key_action_activate(Evas_Object *obj, const char *params);
static const Elm_Action key_actions[] = {
{"move", _key_action_move},
+ {"activate", _key_action_activate},
{NULL, NULL}
};
@@ -237,6 +239,7 @@ _items_del(Elm_Colorselector_Data *sd)
sd->items = NULL;
sd->selected = NULL;
+ sd->focus_items = NULL;
}
static void
@@ -1895,6 +1898,7 @@ _elm_colorselector_efl_canvas_group_group_add(Eo *obj,
Elm
[EGIT] [tools/enventor] master 01/01: search: fix the wrong replace behavior
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=db198e890152977835e9cccad4865aa926c53e78 commit db198e890152977835e9cccad4865aa926c53e78 Author: Taehyub Kim Date: Mon Sep 19 17:26:44 2016 +0900 search: fix the wrong replace behavior Summary: fix the wrong behavior of replace logic Test Plan: 1. launch enventor with basic template 2. open search window 3. input part keyword to the find entry 4. input some text to the replace with entry 5. press next button and find part keyword 6. press replace button again and again until all of keyword are changed 7. check it is working correctly Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet Differential Revision: https://phab.enlightenment.org/D4299 --- src/bin/search.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/search.c b/src/bin/search.c index 12a7453..6cd821c 100644 --- a/src/bin/search.c +++ b/src/bin/search.c @@ -228,6 +228,7 @@ replace_proc(search_data *sd) if (strcmp(find, utf8)) return EINA_FALSE; const char *replace = elm_entry_entry_get(sd->en_replace); enventor_item_text_insert(sd->it, replace); + enventor_item_select_none(sd->it); free(utf8); return EINA_TRUE; } --
[EGIT] [tools/enventor] master 03/04: file_mgr: remove unnecessary space
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=04957cba70413e7c3c23a18b5bb2229b4981b219 commit 04957cba70413e7c3c23a18b5bb2229b4981b219 Author: Taehyub Kim Date: Thu Sep 1 20:07:37 2016 +0900 file_mgr: remove unnecessary space Summary: remove unncessary space Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet Reviewed By: Hermet Differential Revision: https://phab.enlightenment.org/D4264 --- src/bin/file_mgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/file_mgr.c b/src/bin/file_mgr.c index 4f65386..39d1506 100644 --- a/src/bin/file_mgr.c +++ b/src/bin/file_mgr.c @@ -140,7 +140,7 @@ enventor_edc_modified_cb(void *data, Evas_Object *obj EINA_UNUSED, fmd->edc_modified = EINA_TRUE; - /* FIXME: Here ignore edc changes, if any menu is closed, + /* FIXME: Here ignore edc changes, if any menu is closed, then we need to open warning box. */ if (menu_activated_get()) return; --
[EGIT] [tools/enventor] master 01/04: base_gui: apply enventor coding convention
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=65e13b5c729e54b52bb3df10005ff4658d6ce73c
commit 65e13b5c729e54b52bb3df10005ff4658d6ce73c
Author: Taehyub Kim
Date: Thu Sep 1 20:06:42 2016 +0900
base_gui: apply enventor coding convention
Summary: apply enventor coding convention
Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet
Reviewed By: Hermet
Differential Revision: https://phab.enlightenment.org/D4262
---
src/bin/base_gui.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/bin/base_gui.c b/src/bin/base_gui.c
index 4f69433..3e4f5e7 100644
--- a/src/bin/base_gui.c
+++ b/src/bin/base_gui.c
@@ -105,7 +105,8 @@ base_file_tab_toggle(Eina_Bool toggle)
}
}
-void base_file_browser_toggle(Eina_Bool toggle)
+void
+base_file_browser_toggle(Eina_Bool toggle)
{
base_data *bd = g_bd;
EINA_SAFETY_ON_NULL_RETURN(bd);
@@ -118,7 +119,8 @@ void base_file_browser_toggle(Eina_Bool toggle)
elm_object_signal_emit(bd->layout, "elm,state,file_browser,hide", "");
}
-void base_edc_navigator_deselect(void)
+void
+base_edc_navigator_deselect(void)
{
if (config_edc_navigator_get())
edc_navigator_deselect();
--
[EGIT] [tools/enventor] master 02/04: edc_navigator: remove unnecessary space
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=46e3db339212a63e1547867243e17037068b84e0
commit 46e3db339212a63e1547867243e17037068b84e0
Author: Taehyub Kim
Date: Thu Sep 1 20:07:04 2016 +0900
edc_navigator: remove unnecessary space
Summary: remove unncessary space
Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet
Reviewed By: Hermet
Differential Revision: https://phab.enlightenment.org/D4263
---
src/bin/edc_navigator.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/edc_navigator.c b/src/bin/edc_navigator.c
index e327eae..a3f5c70 100644
--- a/src/bin/edc_navigator.c
+++ b/src/bin/edc_navigator.c
@@ -937,7 +937,7 @@ programs_update(navi_data *nd, group_it *git)
Enventor_Object *enventor = base_enventor_get();
Eina_List *program_list = enventor_object_programs_list_get(enventor);
- //oh, no programs..
+ //oh, no programs..
if (!program_list)
{
navigator_programs_clear(git);
@@ -1372,7 +1372,7 @@ edc_navigator_group_update(const char *cur_group)
//FIXME: This function is unnecessarily called... why?
- //Cancel item selection if group was not indicated.
+ //Cancel item selection if group was not indicated.
if (!cur_group) navigator_item_deselect(nd);
Eina_List *group_list =
enventor_item_group_list_get(file_mgr_focused_item_get());
--
[EGIT] [tools/enventor] master 04/04: menu: remove unncessary space
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=6ba889ae26a223e19f1696c9579aa85708cfc4fb
commit 6ba889ae26a223e19f1696c9579aa85708cfc4fb
Author: Taehyub Kim
Date: Thu Sep 1 20:08:05 2016 +0900
menu: remove unncessary space
Summary: remove unncessary space
Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet
Reviewed By: Hermet
Differential Revision: https://phab.enlightenment.org/D4265
---
src/bin/menu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/menu.c b/src/bin/menu.c
index de9734e..660d8c1 100644
--- a/src/bin/menu.c
+++ b/src/bin/menu.c
@@ -700,7 +700,7 @@ menu_toggle(void)
return;
}
- //Main Menu
+ //Main Menu
if (md->active_request) menu_close(md);
else
{
--
[EGIT] [tools/enventor] master 01/02: utils: apply enventor coding convention
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=5f2682a79219d4d7090dce328f3d3d8b56d05e28
commit 5f2682a79219d4d7090dce328f3d3d8b56d05e28
Author: Taehyub Kim
Date: Thu Sep 1 20:02:52 2016 +0900
utils: apply enventor coding convention
Summary: apply enventor coding convention
Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet
Reviewed By: Hermet
Differential Revision: https://phab.enlightenment.org/D4268
---
src/bin/utils.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/bin/utils.c b/src/bin/utils.c
index 8695c16..9a0c194 100644
--- a/src/bin/utils.c
+++ b/src/bin/utils.c
@@ -9,7 +9,8 @@ char EDJE_PATH[PATH_MAX];
const char *ENVENTOR_NAME = "enventor";
Enventor_Item *active_item = NULL;
-void mem_fail_msg(void)
+void
+mem_fail_msg(void)
{
EINA_LOG_ERR("Failed to allocate Memory!");
}
--
[EGIT] [tools/enventor] master 02/02: text_setting: remove unncessary space
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=341b9827e3a0dc3f254a75fb500ecf65ec04ce1c commit 341b9827e3a0dc3f254a75fb500ecf65ec04ce1c Author: Taehyub Kim Date: Thu Sep 1 20:03:33 2016 +0900 text_setting: remove unncessary space Summary: remove unnecessary space Reviewers: Jaehyun_Cho, NikaWhite, Hermet Reviewed By: Hermet Differential Revision: https://phab.enlightenment.org/D4267 --- src/bin/text_setting.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/text_setting.c b/src/bin/text_setting.c index 324f48c..9c6e782 100644 --- a/src/bin/text_setting.c +++ b/src/bin/text_setting.c @@ -112,7 +112,7 @@ static int color_type_list[COLOR_KEYWORD_MAX_CNT] = ENVENTOR_SYNTAX_COLOR_SYMBOL, ENVENTOR_SYNTAX_COLOR_SYMBOL, //set_int(... ENVENTOR_SYNTAX_COLOR_SCRIPT_FUNC,ENVENTOR_SYNTAX_COLOR_SYMBOL, - //flag, 1);... + //flag, 1);... ENVENTOR_SYNTAX_COLOR_SYMBOL, ENVENTOR_SYNTAX_COLOR_SYMBOL, //} } ENVENTOR_SYNTAX_COLOR_SYMBOL, ENVENTOR_SYNTAX_COLOR_SYMBOL --
[EGIT] [tools/enventor] master 01/01: template: remove unnecessary space
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=6b7ec9dcd52328e508e2499c9f96922c9e389d93
commit 6b7ec9dcd52328e508e2499c9f96922c9e389d93
Author: Taehyub Kim
Date: Thu Sep 1 20:01:14 2016 +0900
template: remove unnecessary space
Summary: remove unncessary space
Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet
Reviewed By: Hermet
Differential Revision: https://phab.enlightenment.org/D4270
---
src/lib/template.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/template.c b/src/lib/template.c
index 59c636a..4b8c79f 100644
--- a/src/lib/template.c
+++ b/src/lib/template.c
@@ -334,7 +334,7 @@ template_part_insert(edit_data *ed, Edje_Part_Type
part_type,
line_cnt += 2;
}
- //If there are some relative_to part then insert relative_to
+ //If there are some relative_to part then insert relative_to
if (rel1_x_to)
{
elm_entry_entry_insert(edit_entry, p);
--
[EGIT] [tools/enventor] master 01/01: dummy_obj: apply enventor coding convention
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=0238ed5162c9fce287152c94221c6ad84025d686
commit 0238ed5162c9fce287152c94221c6ad84025d686
Author: Taehyub Kim
Date: Thu Sep 1 20:02:08 2016 +0900
dummy_obj: apply enventor coding convention
Summary: apply enventor coding convention
Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet
Reviewed By: Hermet
Differential Revision: https://phab.enlightenment.org/D4269
---
src/lib/dummy_obj.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/lib/dummy_obj.c b/src/lib/dummy_obj.c
index c30685b..3a29817 100644
--- a/src/lib/dummy_obj.c
+++ b/src/lib/dummy_obj.c
@@ -199,6 +199,7 @@ layout_geom_changed_cb(void *data, Evas *evas EINA_UNUSED,
evas_object_move(po->obj, lx + x, ly + y);
}
}
+
static Eina_Bool
animator_cb(void *data)
{
--
[EGIT] [tools/enventor] master 01/01: lib util: apply enventor coding convention
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=a7329630c38af7e13d5d591f9b46a0bd9b2b202c
commit a7329630c38af7e13d5d591f9b46a0bd9b2b202c
Author: Taehyub Kim
Date: Thu Sep 1 20:00:13 2016 +0900
lib util: apply enventor coding convention
Summary: apply enventor coding convention
Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet
Reviewed By: Hermet
Differential Revision: https://phab.enlightenment.org/D4271
---
src/lib/util.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/lib/util.c b/src/lib/util.c
index 43b2358..3ae1fde 100644
--- a/src/lib/util.c
+++ b/src/lib/util.c
@@ -5,7 +5,8 @@
#include
#include "enventor_private.h"
-void mem_fail_msg(void)
+void
+mem_fail_msg(void)
{
EINA_LOG_ERR("Failed to allocate Memory!");
}
--
[EGIT] [tools/enventor] master 01/01: file_tab: add 'bring in' feature for the item out of file tab
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=6d109cf27a94bd7da71295099720255641fe156a commit 6d109cf27a94bd7da71295099720255641fe156a Author: Taehyub Kim Date: Fri Aug 19 12:59:06 2016 +0900 file_tab: add 'bring in' feature for the item out of file tab Summary: when the item of file tab which is in out of file tab view needs to be shown, It should be moved into the file tab view Test Plan: 1. launch enventor with multi-file supports 2. add item fully to the file tab 3. click next arrow in file tab and move the selection item 4. when selection item reached end of file tab 5. check the next item which is out of file tab view comes into the file tab view Reviewers: Hermet, Jaehyun_Cho, NikaWhite, bowonryu Differential Revision: https://phab.enlightenment.org/D4242 --- src/bin/file_tab.c | 4 1 file changed, 4 insertions(+) diff --git a/src/bin/file_tab.c b/src/bin/file_tab.c index 00fb221..e804f6e 100644 --- a/src/bin/file_tab.c +++ b/src/bin/file_tab.c @@ -31,7 +31,9 @@ left_btn_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, if (!it) return; it = elm_list_item_prev(it); if (!it) return; + elm_list_item_selected_set(it, EINA_TRUE); + elm_list_item_bring_in(it); } static void @@ -46,7 +48,9 @@ right_btn_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, if (!it) return; it = elm_list_item_next(it); if (!it) return; + elm_list_item_selected_set(it, EINA_TRUE); + elm_list_item_bring_in(it); } static Eina_Bool --
[EGIT] [tools/enventor] master 01/02: edc_parser: move the functions in utils which are find_part and find_group to the edc_parser
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=f0ab0ec9a9c16ab186a0b2cdac9ea89f253c263a
commit f0ab0ec9a9c16ab186a0b2cdac9ea89f253c263a
Author: Taehyub Kim
Date: Fri Aug 19 12:56:21 2016 +0900
edc_parser: move the functions in utils which are find_part and find_group
to the edc_parser
Summary:
move hte functions in utils which are find_part and find_group to the
edc_parser
since it is right way
Test Plan:
1. launch enventor
2. move cursor on part name in text view
3. press F3 key
4. check it works well
Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet
Reviewed By: Hermet
Differential Revision: https://phab.enlightenment.org/D4240
---
src/lib/edc_editor.c | 13 +++--
src/lib/edc_parser.c | 136 +
src/lib/enventor_private.h | 43 +++---
src/lib/util.c | 136 +
4 files changed, 166 insertions(+), 162 deletions(-)
diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index ecb63ad..2715caa 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -1946,15 +1946,16 @@ goto_part_name(edit_data *ed, const char *part_name)
//Find part name in current group
const char *part_type =
- part_type_get(view_part_type_get(edj_mgr_view_get(NULL), part_name));
+ part_type_str_convert(view_part_type_get(edj_mgr_view_get(NULL),
+part_name));
if (!part_type) goto end;
const char *start_pos =
- find_part_proc_internal(utf8,
- (utf8 + strlen(utf8)),
- group_name,
- part_name,
- part_type);
+ parser_part_pos_get(utf8,
+ (utf8 + strlen(utf8)),
+ group_name,
+ part_name,
+ part_type);
if (!start_pos) goto end;
//Select part name
diff --git a/src/lib/edc_parser.c b/src/lib/edc_parser.c
index 17fb5a1..67368a7 100644
--- a/src/lib/edc_parser.c
+++ b/src/lib/edc_parser.c
@@ -2161,3 +2161,139 @@ end:
return group_list;
}
+
+char*
+parser_group_pos_get(char *utf8, char *utf8_end,
+ const char *group_name)
+{
+ char *p = utf8;
+ char *result = NULL;
+
+ int group_name_len = strlen(group_name);
+
+ //Find group
+ while (utf8_end > p)
+ {
+//Skip " ~ " Section
+if (*p == '\"')
+ {
+ ESCAPE_RET_NULL();
+ }
+
+if (!strncmp("group", p, strlen("group")))
+ {
+ p = strstr((p + 5), "\"");
+ if (!p) return NULL;
+ p++;
+ if (!strncmp(group_name, p, group_name_len))
+ {
+ //Compare Elaborately
+ char *next_quote = strstr(p, "\"");
+ if (group_name_len == (next_quote - p))
+{
+ result = p;
+ break;
+}
+ else
+{
+ ESCAPE_RET_NULL();
+}
+ }
+ else
+ {
+ ESCAPE_RET_NULL();
+ }
+ }
+p++;
+ }
+
+ return result;
+}
+
+char*
+parser_part_pos_get(char *utf8, char *utf8_end,
+const char* group_name,
+const char *part_name, const char *part_type)
+{
+ char *p = parser_group_pos_get(utf8, utf8_end, group_name);
+
+ //No found
+ if (!p) return NULL;
+
+ p = strstr(p, "\"");
+ if (!p) return NULL;
+ p++;
+
+ char *result = NULL;
+
+ //goto parts
+ p = strstr(p, "parts");
+ if (!p) return NULL;
+
+ int part_name_len = strlen(part_name);
+
+ //Find part
+ while (utf8_end > p)
+ {
+//Skip " ~ " Section
+if (*p == '\"')
+ {
+ ESCAPE_RET_NULL();
+ }
+
+if (!strncmp(part_type, p, strlen(part_type)))
+ {
+ p = strstr((p + strlen(part_type)), "\"");
+ if (!p) return NULL;
+ p++;
+ if (!strncmp(part_name, p, part_name_len))
+ {
+ //Compare Elaborately
+ char *next_quote = strstr(p, "\"");
+ if (part_name_len == (next_quote - p))
+{
+ result = p;
+ break;
+}
+ else
+{
+ ESCAPE_RET_NULL();
+}
+ }
+ else
+ {
+ ESCAPE_RET_NULL();
[EGIT] [tools/enventor] master 01/01: console: fix the selection function of console error message
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=644d004f93450eddc6492b7b45add00a8e79c2da
commit 644d004f93450eddc6492b7b45add00a8e79c2da
Author: Taehyub Kim
Date: Fri Aug 19 12:52:31 2016 +0900
console: fix the selection function of console error message
Summary:
fix the selection function of console error message,
it was behavior broken since there is markup text in console message.
so I fixed it work well.
Test Plan:
1. launch enventor
2. make some error in text view
3. save
4. check the selection region in text view
Reviewers: Hermet, Jaehyun_Cho, NikaWhite, bowonryu
Differential Revision: https://phab.enlightenment.org/D4239
---
src/bin/console.c | 84 ++-
1 file changed, 46 insertions(+), 38 deletions(-)
diff --git a/src/bin/console.c b/src/bin/console.c
index 1eabfae..88dcf8b 100644
--- a/src/bin/console.c
+++ b/src/bin/console.c
@@ -9,7 +9,7 @@ token_value_get(char *src, char *key_str, char end_key, int
offset, char *dst)
{
char *psrc = src;
int count = 0;
- psrc += (strlen(key_str) + offset ) * sizeof(char);
+ psrc += strlen(key_str) + offset;
while (*psrc != end_key)
dst[count++] = *psrc++;
dst[count] = '\0';
@@ -18,51 +18,59 @@ token_value_get(char *src, char *key_str, char end_key, int
offset, char *dst)
static void
error_word_select(Evas_Object *console)
{
- const char *console_text = elm_entry_entry_get(console);
- if (console_text == NULL) return;
+ //Convert console text including markup text to the plain text
+ const char *markup_text = elm_entry_entry_get(console);
+ if (!markup_text) return;
+ char *console_text = elm_entry_markup_to_utf8(markup_text);
+ if (!console_text) return;
char error_word[1024];
char error_line[1024];
char *error_token, *edc_token;
- //parse edc line
- if ((edc_token = strstr(console_text, "edc:")))
- token_value_get(edc_token, "edc:", ' ', 0, error_line);
- else return;
+ //Parse edc line
+ if ((edc_token = strstr(console_text, "edc : ")))
+ token_value_get(edc_token, "edc : ", ' ', 0, error_line);
+ else
+ goto end;
- //parse error word
+ //Parse error word
if ((error_token = strstr(console_text, "keyword")))
- token_value_get(error_token, "keyword", '\0', 1, error_word);
+ token_value_get(error_token, "keyword", ' ', 1, error_word);
else if ((error_token = strstr(console_text, "name")))
- token_value_get(error_token, "name", '\0', 1, error_word);
- else return;
-
-//FIXME: Need to get the file that contains errors.
-Enventor_Item *it = file_mgr_focused_item_get();
-EINA_SAFETY_ON_NULL_RETURN(it);
-
-//find error word position
-enventor_item_line_goto(it, atoi(error_line));
-int pos = enventor_item_cursor_pos_get(it);
-const char *entry_text = enventor_item_text_get(it);
-char *utf8 = elm_entry_markup_to_utf8(entry_text);
-const char *search_line = utf8 + pos * sizeof(char);
-const char *matched = strstr(search_line, error_word);
-
-if (matched == NULL)
- {
- free(utf8);
- return;
- }
-
-int start, end;
-start = matched - utf8;
-end = start + strlen(error_word);
-
-free(utf8);
-
-//select error word
-enventor_item_select_region_set(it, start, end);
+ token_value_get(error_token, "name", ' ', 1, error_word);
+ else
+ goto end;
+
+ //FIXME: Need to get the file that contains errors.
+ Enventor_Item *it = file_mgr_focused_item_get();
+ EINA_SAFETY_ON_NULL_RETURN(it);
+
+ //Find error word position
+ enventor_item_line_goto(it, atoi(error_line));
+ int pos = enventor_item_cursor_pos_get(it);
+ const char *entry_text = enventor_item_text_get(it);
+ char *utf8 = elm_entry_markup_to_utf8(entry_text);
+ if(!utf8) goto end;
+
+ const char *search_line = utf8 + pos;
+ const char *matched = strstr(search_line, error_word);
+ if (!matched)
+ {
+free(utf8);
+goto end;
+ }
+
+ int start, end;
+ start = matched - utf8;
+ end = start + strlen(error_word);
+
+ //Select error word
+ enventor_item_select_region_set(it, start, end);
+ free(utf8);
+
+end:
+ free(console_text);
}
static void
--
[EGIT] [tools/enventor] master 01/01: syntax_color: add NULL checking in macro_apply
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=74938a0f6661edff1a23b1f254ad05a91f429a2b
commit 74938a0f6661edff1a23b1f254ad05a91f429a2b
Author: Taehyub Kim
Date: Thu Aug 18 17:06:23 2016 +0900
syntax_color: add NULL checking in macro_apply
Summary:
add NULL checking in macro_apply
@fix
Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet
Differential Revision: https://phab.enlightenment.org/D4237
---
src/lib/syntax_color.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/lib/syntax_color.c b/src/lib/syntax_color.c
index 7d02787..8f01194 100644
--- a/src/lib/syntax_color.c
+++ b/src/lib/syntax_color.c
@@ -480,6 +480,7 @@ macro_apply(Eina_Strbuf *strbuf, const char **src, int
length, char **cur,
while (bracket_inside > 0)
{
macro_end = strchr(macro_end, ')');
+ if (!macro_end) break;
bracket_inside--;
}
if (!macro_end) macro_end = (char *) eol;
--
[EGIT] [tools/enventor] master 01/01: statusbar: disable focus for resize slider bar
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=6dbe2bc4e65cecb8e89df6b6db4b387878939ec2 commit 6dbe2bc4e65cecb8e89df6b6db4b387878939ec2 Author: Taehyub Kim Date: Wed Aug 17 22:30:39 2016 +0900 statusbar: disable focus for resize slider bar Summary: disable focus for resize slider bar Test Plan: 1. launch enventor 2. show resize ctxpopup using status bar 3. check the focus is disable Reviewers: Hermet, Jaehyun_Cho, NikaWhite, bowonryu Differential Revision: https://phab.enlightenment.org/D4232 --- src/bin/statusbar.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/statusbar.c b/src/bin/statusbar.c index 08fb1f2..913b6e9 100644 --- a/src/bin/statusbar.c +++ b/src/bin/statusbar.c @@ -144,6 +144,7 @@ view_resize_slider_layout_create(Evas_Object *parent, const char *type, //Slider Evas_Object *slider = elm_slider_add(layout); + elm_object_focus_allow_set(slider, EINA_FALSE); elm_slider_span_size_set(slider, 120); elm_slider_indicator_show_set(slider, EINA_FALSE); double step = 1 / (double) (3840 - 1); --
[EGIT] [tools/enventor] master 01/01: edc_editor: add NULL checking in edit_cursor_double_clicked_cb
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=7e1a4c00a7b5a846f17c02b44267a71f241a26c9
commit 7e1a4c00a7b5a846f17c02b44267a71f241a26c9
Author: Taehyub Kim
Date: Wed Aug 17 22:29:31 2016 +0900
edc_editor: add NULL checking in edit_cursor_double_clicked_cb
Summary:
add NULL checking in edit_cursor_double_clicked_cb
@fix
Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet
Reviewed By: Hermet
Differential Revision: https://phab.enlightenment.org/D4234
---
src/lib/edc_editor.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index 5925bf8..ecb63ad 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -729,6 +729,8 @@ edit_cursor_double_clicked_cb(void *data, Evas_Object *obj,
if (!selected) return;
selected = elm_entry_markup_to_utf8(selected);
+ if (!selected) return;
+
if (selected[0] == '\"')
{
free(selected);
--
[EGIT] [tools/enventor] master 01/01: auto_comp: apply strncpy in context_lexem_thread_cb
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=950734d000d68066d6717db8bafb0b2ace5fc398
commit 950734d000d68066d6717db8bafb0b2ace5fc398
Author: Taehyub Kim
Date: Wed Aug 17 22:28:16 2016 +0900
auto_comp: apply strncpy in context_lexem_thread_cb
Summary:
apply strncpy in context_lexem_thread_cb
@fix
Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet
Reviewed By: Hermet
Differential Revision: https://phab.enlightenment.org/D4236
---
src/lib/auto_comp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/auto_comp.c b/src/lib/auto_comp.c
index c7a030c..f99277b 100644
--- a/src/lib/auto_comp.c
+++ b/src/lib/auto_comp.c
@@ -166,7 +166,7 @@ context_lexem_thread_cb(void *data, Ecore_Thread *thread)
if (!edit_is_main_file(td->ed))
{
-strcpy(stack[depth], "collections");
+strncpy(stack[depth], "collections", MAX_KEYWORD_LENGTH);
depth++;
}
--
[EGIT] [tools/enventor] master 01/01: syntax_color: add NULL checking in macro_key_push function
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=a47b12bd53606cbd155e79c447a363b6820b5433
commit a47b12bd53606cbd155e79c447a363b6820b5433
Author: Taehyub Kim
Date: Wed Aug 17 22:22:53 2016 +0900
syntax_color: add NULL checking in macro_key_push function
Summary: add NULL checking in macro_key_push function
Reviewers: Jaehyun_Cho, bowonryu, NikaWhite, Hermet
Reviewed By: NikaWhite, Hermet
Differential Revision: https://phab.enlightenment.org/D4235
---
src/lib/syntax_color.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/lib/syntax_color.c b/src/lib/syntax_color.c
index d56bacd..7d02787 100644
--- a/src/lib/syntax_color.c
+++ b/src/lib/syntax_color.c
@@ -191,7 +191,11 @@ macro_key_push(color_data *cd, char *str)
//cutoff "()" from the macro name
char *cut = strchr(key, '(');
- if (cut) key = strndup(str, cut - str);
+ if (cut)
+ {
+key = strndup(str, cut - str);
+if (!key) return;
+ }
char tmp[2];
tmp[0] = key[0];
--
[EGIT] [tools/enventor] master 01/01: enventor_smart: add NULL checking
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=1665ac9ba6e8b534c13f9a179c19e2eeb61abdc2
commit 1665ac9ba6e8b534c13f9a179c19e2eeb61abdc2
Author: Taehyub Kim
Date: Wed Aug 17 22:21:16 2016 +0900
enventor_smart: add NULL checking
Summary:
add NULL checking in syntax_color_set and syntax_color_get API
@fix
Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet
Reviewed By: Hermet
Differential Revision: https://phab.enlightenment.org/D4233
---
src/lib/enventor_smart.c | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c
index 9981a60..38366bf 100644
--- a/src/lib/enventor_smart.c
+++ b/src/lib/enventor_smart.c
@@ -743,7 +743,10 @@ _enventor_object_syntax_color_set(Eo *obj EINA_UNUSED,
if ((color_type < ENVENTOR_SYNTAX_COLOR_STRING) ||
(color_type >= ENVENTOR_SYNTAX_COLOR_LAST))
- EINA_LOG_ERR("Invalid color_type(%d)", color_type);
+ {
+EINA_LOG_ERR("Invalid color_type(%d)", color_type);
+return;
+ }
eina_stringshare_del(pd->text_color_val[color_type]);
pd->text_color_val[color_type] = eina_stringshare_add(val);
@@ -766,7 +769,10 @@ _enventor_object_syntax_color_get(Eo *obj EINA_UNUSED,
{
if ((color_type < ENVENTOR_SYNTAX_COLOR_STRING) ||
(color_type >= ENVENTOR_SYNTAX_COLOR_LAST))
- EINA_LOG_ERR("Invalid color_type(%d)", color_type);
+ {
+EINA_LOG_ERR("Invalid color_type(%d)", color_type);
+return NULL;
+ }
//Return overriden color values or defaults.
if (pd->text_color_val[color_type])
--
[EGIT] [tools/enventor] master 01/01: edc_editor: support to jump to the part define
jaehyun pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=bc5a7b3c362668661b9935b262a81b28fb6611c7
commit bc5a7b3c362668661b9935b262a81b28fb6611c7
Author: Taehyub Kim
Date: Tue Aug 16 22:00:01 2016 +0900
edc_editor: support to jump to the part define
Summary: add the new feature to jump to the part define
Test Plan:
1. launch enventor
2. click mouse right button on "relative to" part name in text view
3. check selection is on the part define
Reviewers: Hermet, NikaWhite, bowonryu, Jaehyun_Cho
Reviewed By: Jaehyun_Cho
Tags: #enventor
Differential Revision: https://phab.enlightenment.org/D4167
---
src/lib/edc_editor.c | 130 -
src/lib/edc_parser.c | 115 +
src/lib/enventor_private.h | 23 ++-
src/lib/util.c | 156 +
4 files changed, 422 insertions(+), 2 deletions(-)
diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index 610e31c..5925bf8 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -1848,6 +1848,123 @@ edit_key_down_event_dispatch(edit_data *ed, const char
*key)
return EINA_FALSE;
}
+static char*
+cursor_part_name_get(edit_data *ed)
+{
+ int part_begin, part_end;
+ part_begin = part_end = -1;
+
+ Evas_Object *tb = elm_entry_textblock_get(ed->en_edit);
+ Evas_Textblock_Cursor *cur = evas_object_textblock_cursor_get(tb);
+ Evas_Textblock_Cursor *cur_l = evas_object_textblock_cursor_new(tb);
+ Evas_Textblock_Cursor *cur_r = evas_object_textblock_cursor_new(tb);
+
+ int cur_pos = evas_textblock_cursor_pos_get(cur);
+ evas_textblock_cursor_pos_set(cur_l, cur_pos);
+ evas_textblock_cursor_pos_set(cur_r, cur_pos);
+
+ //Search the end character to the left
+ Eina_Bool is_prev = EINA_TRUE;
+ char *ch_l = NULL;
+ ch_l = evas_textblock_cursor_content_get(cur_l);
+ if (!ch_l) goto end;
+ /* If current character is ", move cursor to the previous character
+ to find part name correctly */
+ if (*ch_l == '\"')
+ is_prev = evas_textblock_cursor_char_prev(cur_l);
+
+ while (is_prev)
+ {
+ch_l = evas_textblock_cursor_content_get(cur_l);
+if (!ch_l || (*ch_l == '\n') || (*ch_l == ';') || (*ch_l == '\0'))
+ break;
+if (*ch_l == '\"')
+ {
+ evas_textblock_cursor_char_next(cur_l);
+ part_begin = evas_textblock_cursor_pos_get(cur_l);
+ break;
+ }
+is_prev = evas_textblock_cursor_char_prev(cur_l);
+ }
+ if (part_begin == -1) goto end;
+
+ //Search the end character to the right
+ Eina_Bool is_next = EINA_TRUE;
+ char *ch_r = NULL;
+ while (is_next)
+ {
+ch_r = evas_textblock_cursor_content_get(cur_r);
+if (!ch_r || (*ch_r == '\n') || (*ch_r == ';') || (*ch_r == '\0'))
+ break;
+if (*ch_r == '\"')
+ {
+ part_end = evas_textblock_cursor_pos_get(cur_r);
+ break;
+ }
+is_next = evas_textblock_cursor_char_next(cur_r);
+ }
+ if (part_end == -1) goto end;
+
+ //Verify the part name
+ if (part_begin != part_end)
+ {
+char *cur_part_name =
+ evas_textblock_cursor_range_text_get(cur_l, cur_r,
+EVAS_TEXTBLOCK_TEXT_PLAIN);
+if (!cur_part_name) goto end;
+
+Eina_List *l;
+char *part_name;
+Eina_List *parts = view_parts_list_get(edj_mgr_view_get(NULL));
+EINA_LIST_FOREACH(parts, l, part_name)
+ {
+ //If part is detected
+ if (!strcmp(part_name, cur_part_name))
+ return cur_part_name;
+ }
+free(cur_part_name);
+ }
+
+end:
+ evas_textblock_cursor_free(cur_l);
+ evas_textblock_cursor_free(cur_r);
+ return NULL;
+}
+
+static void
+goto_part_name(edit_data *ed, const char *part_name)
+{
+ //Find current group name for searching part
+ Eina_Stringshare *group_name =
+ parser_cur_context_group_name_get(ed->pd, ed->en_edit, ed->main);
+ if (!group_name) return;
+
+ const char *text = elm_entry_entry_get(ed->en_edit);
+ char *utf8 = elm_entry_markup_to_utf8(text);
+
+ //Find part name in current group
+ const char *part_type =
+ part_type_get(view_part_type_get(edj_mgr_view_get(NULL), part_name));
+ if (!part_type) goto end;
+
+ const char *start_pos =
+ find_part_proc_internal(utf8,
+ (utf8 + strlen(utf8)),
+ group_name,
+ part_name,
+ part_type);
+ if (!start_pos) goto end;
+
+ //Select part name
+ edit_selection_region_center_set(ed,
+
[EGIT] [tools/enventor] master 01/01: wireframes_obj: restore resize and move callback for layout
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=cb47271ff6dd44b512f3d3bfd12a50742b0719a2
commit cb47271ff6dd44b512f3d3bfd12a50742b0719a2
Author: Taehyub Kim
Date: Mon Aug 15 14:08:39 2016 +0900
wireframes_obj: restore resize and move callback for layout
Summary: restore resize and move callabck for layout
Test Plan:
1. launch enventor
2. open a basic edc
3. add spacer part
4. turn on wireframe
5. resize the view
6. see the result of wireframe
Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet
Differential Revision: https://phab.enlightenment.org/D4216
Conflicts:
src/lib/wireframes_obj.c
---
src/lib/wireframes_obj.c | 62 +---
1 file changed, 48 insertions(+), 14 deletions(-)
diff --git a/src/lib/wireframes_obj.c b/src/lib/wireframes_obj.c
index 218e821..ccad980 100644
--- a/src/lib/wireframes_obj.c
+++ b/src/lib/wireframes_obj.c
@@ -114,7 +114,6 @@ end:
edje_edit_string_list_free(parts);
}
-#if 0
static void
layout_geom_changed_cb(void *data, Evas *evas EINA_UNUSED,
Evas_Object *obj, void *ei EINA_UNUSED)
@@ -128,14 +127,23 @@ layout_geom_changed_cb(void *data, Evas *evas EINA_UNUSED,
evas_object_geometry_get(obj, &lx, &ly, NULL, NULL);
EINA_LIST_FOREACH(wireframes->part_list, spacer_l, po)
- if (edje_object_part_exists(obj, po->name))
- {
- edje_object_part_geometry_get(obj, po->name, &x, &y, &w, &h);
- evas_object_resize(po->obj, w, h);
- evas_object_move(po->obj, lx + x, ly + y);
- }
+ {
+ const char *sel_part = edje_edit_part_selected_state_get(obj,
+ po->name, NULL);
+ // In case of spacer and text, it should be updated
+ // since spacer part can not receive the resize callback and
+ // text is part has delay in update_wireframe_cb.
+ if (edje_object_part_exists(obj, po->name)
+ && ((edje_edit_part_type_get(obj, po->name) == EDJE_PART_TYPE_SPACER)
+ || (edje_edit_part_type_get(obj, po->name) == EDJE_PART_TYPE_TEXT)
+ || !edje_edit_state_visible_get(obj, po->name, sel_part, 0.0)))
+{
+ edje_object_part_geometry_get(obj, po->name, &x, &y, &w, &h);
+ evas_object_resize(po->obj, w, h);
+ evas_object_move(po->obj, lx + x, ly + y);
+}
+}
}
-#endif
static Eina_Bool
animator_cb(void *data)
@@ -178,14 +186,30 @@ update_wireframe_cb(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj,
{
Evas_Coord part_x = 0, part_y = 0, part_w = 0, part_h = 0;
-Evas_Object *part_obj = (Evas_Object *)
-edje_object_part_object_get(wireframes->layout,
-part_name);
-
-evas_object_geometry_get(part_obj, &part_x, &part_y, &part_w, &part_h);
+//Case 1: If Part is the TEXT, the geometry information is different
+//between edje_object_part_geometry_get and evas_object_geometry_get.
+//So here, it should be considered.
+if (edje_edit_part_type_get(wireframes->layout, part_name)
+== EDJE_PART_TYPE_TEXT)
+ {
+ evas_object_geometry_get(wireframes->layout, &part_lx, &part_ly,
+ NULL, NULL);
+ edje_object_part_geometry_get(wireframes->layout, part_name,
+ &part_x, &part_y, &part_w, &part_h);
+ }
+//Case 2: In case of not text case, evas_object_geomtry_get is more
+//precise than edje_object_part_geometry_get.
+else
+ {
+ Evas_Object *part_obj = (Evas_Object *)
+
edje_object_part_object_get(wireframes->layout,
+ part_name);
+ evas_object_geometry_get(part_obj, &part_x, &part_y,
+ &part_w, &part_h);
+ }
evas_object_resize(pobj, part_w, part_h);
-evas_object_move(pobj, part_x, part_y);
+evas_object_move(pobj, part_lx + part_x, part_ly + part_y);
}
}
@@ -279,6 +303,11 @@ wireframes_obj_new(Evas_Object *layout)
evas_object_event_callback_add(layout, EVAS_CALLBACK_DEL, layout_del_cb,
wireframes);
+ evas_object_event_callback_add(layout, EVAS_CALLBACK_RESIZE,
+ layout_geom_changed_cb, wireframes);
+ evas_object_event_callback_add(layout, EVAS_CALLBACK_MOVE,
+ layout_geom_changed_cb, wireframes);
+
wireframes->la
[EGIT] [tools/enventor] master 01/01: wirefrmaes_obj: update wireframe when it is animated
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=4f3e016ca9668e8bc2bcc18af77eac96398224a6
commit 4f3e016ca9668e8bc2bcc18af77eac96398224a6
Author: Taehyub Kim
Date: Fri Aug 5 17:01:48 2016 +0900
wirefrmaes_obj: update wireframe when it is animated
Summary:
when animation is working, wire frame is not updated.
so I fixed it.
Test Plan:
1. launch enventor.
2. run animation template
3. see the result about update of wireframe
Reviewers: Jaehyun_Cho, NikaWhite, Hermet
Differential Revision: https://phab.enlightenment.org/D4214
---
src/lib/edj_viewer.c | 2 +-
src/lib/enventor_private.h | 1 +
src/lib/wireframes_obj.c | 104 +
3 files changed, 98 insertions(+), 9 deletions(-)
diff --git a/src/lib/edj_viewer.c b/src/lib/edj_viewer.c
index 73fa1ec..80002e0 100644
--- a/src/lib/edj_viewer.c
+++ b/src/lib/edj_viewer.c
@@ -379,6 +379,7 @@ update_edj_file_internal(view_data *vd)
vd->changed_part.state);
view_obj_parts_callbacks_set(vd);
+ wireframes_obj_callbacks_set(vd->layout);
vd->edj_reload_need = EINA_FALSE;
vd->file_set_finished = EINA_TRUE;
@@ -928,6 +929,5 @@ view_mirror_mode_update(view_data *vd)
edje_object_mirrored_set(vd->layout,
enventor_obj_mirror_mode_get(vd->enventor));
dummy_obj_update(vd->layout);
- wireframes_obj_update(vd->layout);
part_obj_geom_cb(vd, evas_object_evas_get(vd->layout), vd->part_obj, NULL);
}
diff --git a/src/lib/enventor_private.h b/src/lib/enventor_private.h
index 502add4..f7e6b09 100644
--- a/src/lib/enventor_private.h
+++ b/src/lib/enventor_private.h
@@ -163,6 +163,7 @@ void dummy_obj_update(Evas_Object *layout);
void wireframes_obj_new(Evas_Object *layout);
void wireframes_obj_del(Evas_Object *layout);
void wireframes_obj_update(Evas_Object *layout);
+void wireframes_obj_callbacks_set(Evas_Object *layout);
/* edj_mgr */
void edj_mgr_init(Enventor_Object *enventor);
diff --git a/src/lib/wireframes_obj.c b/src/lib/wireframes_obj.c
index 248c33e..38dfaf4 100644
--- a/src/lib/wireframes_obj.c
+++ b/src/lib/wireframes_obj.c
@@ -151,6 +151,92 @@ layout_del_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
Evas_Object *obj,
wireframes_obj_del(obj);
}
+static void
+update_wireframe_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
+void *event_info EINA_UNUSED)
+{
+ wireframes_obj *wireframes = data;
+
+ Eina_List *part_l;
+ part_obj *po;
+ Evas_Object *pobj = NULL;
+
+ const char *part_name = evas_object_data_get(obj, "part_name");
+
+ //Find the wireframe matched to the part name.
+ EINA_LIST_FOREACH(wireframes->part_list, part_l, po)
+ {
+if (po->name != part_name) continue;
+pobj = po->obj;
+break;
+ }
+
+ //Update the wireframe of the part name.
+ if (pobj)
+ {
+Evas_Coord part_lx = 0, part_ly = 0;
+Evas_Coord part_x = 0, part_y = 0, part_w = 0, part_h = 0;
+
+Evas_Object *part_obj = (Evas_Object *)
+edje_object_part_object_get(wireframes->layout,
+part_name);
+
+evas_object_geometry_get(part_obj, &part_x, &part_y, &part_w, &part_h);
+
+evas_object_resize(pobj, part_w, part_h);
+evas_object_move(pobj, part_x, part_y);
+ }
+}
+
+static void
+wireframes_callbacks_set(wireframes_obj *wireframes, Evas_Object *layout)
+{
+ Eina_List *l = NULL;
+ Eina_Stringshare *part_name = NULL;
+ Eina_List *parts = edje_edit_parts_list_get(layout);
+
+ //Set resize and move callback to the edje part in layout to update
wireframe.
+ EINA_LIST_FOREACH(parts, l, part_name)
+ {
+Evas_Object *edje_part =
+ (Evas_Object *)edje_object_part_object_get(layout, part_name);
+if (edje_part)
+ {
+ evas_object_event_callback_del(edje_part, EVAS_CALLBACK_RESIZE,
+update_wireframe_cb);
+ evas_object_event_callback_del(edje_part, EVAS_CALLBACK_MOVE,
+update_wireframe_cb);
+ evas_object_event_callback_add(edje_part, EVAS_CALLBACK_RESIZE,
+update_wireframe_cb, wireframes);
+ evas_object_event_callback_add(edje_part, EVAS_CALLBACK_MOVE,
+update_wireframe_cb, wireframes);
+ }
+ }
+}
+
+static void
+wireframes_callbacks_del(wireframes_obj *wireframes, Evas_Object *layout)
+{
+ Eina_List *l = NULL;
+ Eina_Stringshare *part_name = NULL;
+ Eina_List *parts = edje_edit_parts_list_get(layout);
+
+ //Remove the callback of wireframe
+ EINA_LIST_
[EGIT] [tools/enventor] master 01/01: envnetor_smart: fix the view resize callback
jaehyun pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=a6b495dc9cc7c2d47ed5ec97454a6ef61d6eac6d
commit a6b495dc9cc7c2d47ed5ec97454a6ef61d6eac6d
Author: Taehyub Kim
Date: Tue Aug 2 22:49:28 2016 +0900
envnetor_smart: fix the view resize callback
Summary: fix the view resize callback
Test Plan:
1. launch enventor
2. run group template
3. change the view size
4. change the group
5. change the view size
6. change the group to firxt
7. see the result
Reviewers: Hermet, NikaWhite, Jaehyun_Cho
Reviewed By: Jaehyun_Cho
Differential Revision: https://phab.enlightenment.org/D4208
---
src/bin/main.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/bin/main.c b/src/bin/main.c
index b1b1b59..138826f 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -447,6 +447,7 @@ enventor_live_view_resized_cb(void *data EINA_UNUSED,
{
Enventor_Live_View_Size *size = event_info;
stats_view_size_update(size->w, size->h);
+ config_view_size_set(size->w, size->h);
}
static void
--
[EGIT] [tools/enventor] master 01/01: envnetor_smart: keep the each view size
jaehyun pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=160f67223286dbabf95f35b43e26556ac2699ef6
commit 160f67223286dbabf95f35b43e26556ac2699ef6
Author: Taehyub Kim
Date: Tue Aug 2 22:34:15 2016 +0900
envnetor_smart: keep the each view size
Summary: when group is changed, view information should be updated
Test Plan:
1. launch enventor
2. run group template
3. change the view size
4. change the group
5. change the view size
6. change the group to firxt
7. see the result
Reviewers: Hermet, NikaWhite, Jaehyun_Cho
Reviewed By: Jaehyun_Cho
Differential Revision: https://phab.enlightenment.org/D4207
---
src/bin/main.c | 12
src/lib/enventor_smart.c | 18 +-
2 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/src/bin/main.c b/src/bin/main.c
index 9f8ff57..b1b1b59 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -447,16 +447,20 @@ enventor_live_view_resized_cb(void *data EINA_UNUSED,
{
Enventor_Live_View_Size *size = event_info;
stats_view_size_update(size->w, size->h);
- config_view_size_set(size->w, size->h);
}
static void
enventor_live_view_loaded_cb(void *data EINA_UNUSED, Enventor_Object *obj,
void *event_info EINA_UNUSED)
{
- Evas_Coord w, h;
- config_view_size_get(&w, &h);
- enventor_object_live_view_size_set(obj, w, h);
+ Evas_Coord view_w, view_h;
+ enventor_object_live_view_size_get(obj, &view_w, &view_h);
+ if (!view_w && !view_h)
+ {
+Evas_Coord w, h;
+config_view_size_get(&w, &h);
+enventor_object_live_view_size_set(obj, w, h);
+ }
base_edc_navigator_group_update();
}
diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c
index 04ef34d..951c630 100644
--- a/src/lib/enventor_smart.c
+++ b/src/lib/enventor_smart.c
@@ -139,7 +139,23 @@ edit_view_sync_cb(void *data, Eina_Stringshare
*state_name, double state_value,
if (pd->group_name != group_name)
{
view_data *vd = edj_mgr_view_get(group_name);
-if (vd) edj_mgr_view_switch_to(vd);
+if (vd)
+ {
+ edj_mgr_view_switch_to(vd);
+
+ Evas_Coord prev_w, prev_h;
+ view_data *prev_vd = edj_mgr_view_get(pd->group_name);
+ view_size_get(prev_vd, &prev_w, &prev_h);
+
+ static Enventor_Live_View_Size size;
+ view_size_get(vd, &size.w, &size.h);
+ if (size.w && size.h &&
+ ((size.w != prev_w) || (size.h != prev_h)))
+ {
+ evas_object_smart_callback_call(pd->obj,
+ SIG_LIVE_VIEW_RESIZED,
&size);
+ }
+ }
else
{
vd = edj_mgr_view_new(it, group_name);
--
[EGIT] [tools/enventor] master 02/02: live_edit: add more condition for min size of live edit item
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=5ddaa8dbe5a3cb39d70446932c1f60ecb418b775
commit 5ddaa8dbe5a3cb39d70446932c1f60ecb418b775
Author: Taehyub Kim
Date: Thu Jul 21 17:25:11 2016 +0900
live_edit: add more condition for min size of live edit item
Summary:
In case of the live edit item has min size without relative to part,
the size of the item should not be changed.
To cover this case, I added more condition
Test Plan:
1. launch envnetor
2. click a live edit item on tools
3. check the fixed option without "relative to" setting
4. insert the item with mouse double click
5. see the min size of the item while the view size is changing
Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet
Differential Revision: https://phab.enlightenment.org/D4173
---
src/bin/live_edit.c | 38 --
1 file changed, 28 insertions(+), 10 deletions(-)
diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index 98ef8b1..351081a 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -388,8 +388,22 @@ calc_relative_info(live_data *ld)
ld->rel_to_info.rel1_x_part = strndup(ld->rel_to_info.rel2_x_part,
strlen(ld->rel_to_info.rel2_x_part));
}
+else
+ {
+ float center = (ld->rel_info.rel1_x + ld->rel_info.rel2_x) / 2;
+ ld->rel_to_info.rel1_x = center;
+ ld->rel_to_info.rel2_x = center;
+ }
ld->rel_to_info.min_w = min_w;
}
+ else
+ {
+//If there is no relative setting, set base relative
+if (!ld->rel_to_info.rel1_x_part)
+ ld->rel_to_info.rel1_x = ld->rel_info.rel1_x;
+if (!ld->rel_to_info.rel2_x_part)
+ ld->rel_to_info.rel2_x = ld->rel_info.rel2_x;
+ }
//Set fixed properties of height for current Live Edit Item
if (fixed_h)
@@ -410,18 +424,22 @@ calc_relative_info(live_data *ld)
ld->rel_to_info.rel1_y_part = strndup(ld->rel_to_info.rel2_y_part,
strlen(ld->rel_to_info.rel2_y_part));
}
+else
+ {
+ float center = (ld->rel_info.rel1_y + ld->rel_info.rel2_y) / 2;
+ ld->rel_to_info.rel1_y = center;
+ ld->rel_to_info.rel2_y = center;
+ }
ld->rel_to_info.min_h = min_h;
}
-
- //If there is no relative setting, set base relative
- if (!ld->rel_to_info.rel1_x_part)
- ld->rel_to_info.rel1_x = ld->rel_info.rel1_x;
- if (!ld->rel_to_info.rel1_y_part)
- ld->rel_to_info.rel1_y = ld->rel_info.rel1_y;
- if (!ld->rel_to_info.rel2_x_part)
- ld->rel_to_info.rel2_x = ld->rel_info.rel2_x;
- if (!ld->rel_to_info.rel2_y_part)
- ld->rel_to_info.rel2_y = ld->rel_info.rel2_y;
+ else
+ {
+//If there is no relative setting, set base relative
+if (!ld->rel_to_info.rel1_y_part)
+ ld->rel_to_info.rel1_y = ld->rel_info.rel1_y;
+if (!ld->rel_to_info.rel2_y_part)
+ ld->rel_to_info.rel2_y = ld->rel_info.rel2_y;
+ }
}
static void
--
[EGIT] [tools/enventor] master 01/01: tempalate: change the description
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=18030c6532bb468eddeb2f3116b1c694d702d178
commit 18030c6532bb468eddeb2f3116b1c694d702d178
Author: Taehyub Kim
Date: Thu Jul 7 11:08:24 2016 +0900
tempalate: change the description
Summary: change the description
Test Plan:
1. open new file
2. see the template name
Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet
Differential Revision: https://phab.enlightenment.org/D4091
Conflicts:
data/templates/Makefile.am
---
data/templates/{basic.edc => Basic.edc}| 0
data/templates/{clip.edc => Clip.edc} | 0
data/templates/{empty.edc => Empty.edc}| 0
data/templates/{group.edc => Group.edc}| 0
data/templates/{image.edc => Image.edc}| 0
data/templates/Makefile.am | 137 +++--
data/templates/{map.edc => Map.edc}| 0
data/templates/{proxy.edc => Proxy.edc}| 0
data/templates/{rect.edc => Rect.edc} | 0
.../{rotation+zoom.edc => Rotation+Zoom.edc} | 0
data/templates/{sound.edc => Sound.edc}| 0
data/templates/{spacer.edc => Spacer.edc} | 0
data/templates/{text.edc => Text.edc} | 0
data/templates/{textblock.edc => Textblock.edc}| 0
data/templates/{transition.edc => Transition.edc} | 0
data/templates/{tween.edc => Tween.edc}| 0
data/templates/{watchface.edc => Watchface.edc}| 0
data/templates/{watchface2.edc => Watchface2.edc} | 0
src/bin/menu.c | 2 +-
src/bin/newfile.c | 2 +-
20 files changed, 71 insertions(+), 70 deletions(-)
diff --git a/data/templates/basic.edc b/data/templates/Basic.edc
similarity index 100%
rename from data/templates/basic.edc
rename to data/templates/Basic.edc
diff --git a/data/templates/clip.edc b/data/templates/Clip.edc
similarity index 100%
rename from data/templates/clip.edc
rename to data/templates/Clip.edc
diff --git a/data/templates/empty.edc b/data/templates/Empty.edc
similarity index 100%
rename from data/templates/empty.edc
rename to data/templates/Empty.edc
diff --git a/data/templates/group.edc b/data/templates/Group.edc
similarity index 100%
rename from data/templates/group.edc
rename to data/templates/Group.edc
diff --git a/data/templates/image.edc b/data/templates/Image.edc
similarity index 100%
rename from data/templates/image.edc
rename to data/templates/Image.edc
diff --git a/data/templates/Makefile.am b/data/templates/Makefile.am
index 03213ae..66cc785 100644
--- a/data/templates/Makefile.am
+++ b/data/templates/Makefile.am
@@ -4,96 +4,97 @@ EDJE_CC = @edje_cc@
EDJE_FLAGS = -id $(top_srcdir)/data/images -sd $(top_srcdir)/data/sounds
filesdir = $(datadir)/$(PACKAGE)/templates
-files_DATA = basic.edc \
- basic.edj \
- clip.edc \
- clip.edj \
- empty.edc \
- empty.edj \
- group.edc \
- group.edj \
- image.edc \
- image.edj \
- map.edc \
- map.edj \
- proxy.edc \
- proxy.edj \
- rect.edc \
- rect.edj \
- rotation+zoom.edc \
- rotation+zoom.edj \
- sound.edc \
- sound.edj \
- spacer.edc \
- spacer.edj \
- text.edc \
- text.edj \
- textblock.edc \
- textblock.edj \
- transition.edc \
- transition.edj \
- tween.edc \
- tween.edj \
- watchface.edc \
- watchface.edj \
- watchface2.edc \
- watchface2.edj
+files_DATA = Basic.edc \
+ Basic.edj \
+ Clip.edc \
+ Clip.edj \
+ Empty.edc \
+ Empty.edj \
+ Group.edc \
+ Group.edj \
+ Image.edc \
+ Image.edj \
+ Map.edc \
+ Map.edj \
+ Proxy.edc \
+ Proxy.edj \
+ Rect.edc \
+ Rect.edj \
+ Rotation+Zoom.edc \
+ Rotation+Zoom.edj \
+ Sound.edc \
+ Sound.edj \
+ Spacer.edc \
+ Spacer.edj \
+ Text.edc \
+ Text.edj \
+ Textblock.edc \
+ Textblock.edj \
+ Transition.edc \
+ Transition.edj \
+ Tween.edc \
+ Tween.edj \
+ Watchface.edc \
+ Watchface.edj \
+ Watchface2.edc \
+ Watchface2.edj
EXTRA_DIST = $(files_DATA)
srcdir = $(top_srcdir)/data/templates
builddir = $(top_builddir)/data/templates
-basic.edj: Makefile basic.edc
-
[EGIT] [core/efl] master 03/05: elc_popup: move the code making buttons buffer for readability
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ddeab76da0149384844f36516eceb19b53323669
commit ddeab76da0149384844f36516eceb19b53323669
Author: Taehyub Kim
Date: Wed Jul 6 12:50:36 2016 -0700
elc_popup: move the code making buttons buffer for readability
Summary:
The code of making buttons buffer is away from related codes.
@fix
Reviewers: Hermet, Jaehyun_Cho, jpeg, raster, cedric
Subscribers: Blackmole
Differential Revision: https://phab.enlightenment.org/D4133
Signed-off-by: Cedric BAIL
---
src/lib/elementary/elc_popup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index ec476f2..28836ef 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -1181,7 +1181,6 @@ _action_button_set(Evas_Object *obj,
}
}
- snprintf(buf, sizeof(buf), "buttons%i", sd->last_button_number);
if (!sd->action_area)
{
sd->action_area = elm_layout_add(sd->main_layout);
@@ -1193,6 +1192,7 @@ _action_button_set(Evas_Object *obj,
_visuals_set(obj);
}
+ snprintf(buf, sizeof(buf), "buttons%i", sd->last_button_number);
snprintf(style, sizeof(style), "popup/%s", elm_widget_style_get(obj));
if (!elm_layout_theme_set(sd->action_area, "popup", buf, style))
CRI("Failed to set layout!");
--
[EGIT] [tools/enventor] master 01/01: live_edit: align line should be shown always on live edit item
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=381afdd7b1385880f6d03b4f0446fde7158e4367
commit 381afdd7b1385880f6d03b4f0446fde7158e4367
Author: Taehyub Kim
Date: Wed Jul 6 14:18:39 2016 +0900
live_edit: align line should be shown always on live edit item
Summary: align line should be shown always on live edit item
Test Plan:
1. launch enventor
2. click an live edit item on tools
3. move and align the item
4. see the align line on other parts
Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet
Reviewed By: Hermet
Differential Revision: https://phab.enlightenment.org/D4121
---
src/bin/live_edit.c | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index 16bcab9..59b6ea6 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -719,7 +719,6 @@ align_line_update(live_data *ld)
Evas_Coord lx, ly, lw, lh;
Evas_Object *view_obj = view_obj_get(ld);
evas_object_geometry_get(view_obj, &lx, &ly, &lw, &lh);
-
int x, y;
//Top
@@ -1908,8 +1907,17 @@ align_line_init(live_data *ld)
int i;
for (i = 0; i < Align_Line_Cnt; i++)
{
-Evas_Object *layout = elm_layout_add(ld->layout);
-evas_object_smart_member_add(layout, ld->layout);
+//Align line should be located between live edit item and live view
+Evas_Object *layout = elm_layout_add(ld->live_view);
+evas_object_smart_member_add(layout, ld->live_view);
+
+//Clip align line using scroller view
+Evas_Object *scroller = view_scroller_get(ld);
+Evas_Object *scroller_edje = elm_layout_edje_get(scroller);
+Evas_Object *clipper =
+ (Evas_Object *)edje_object_part_object_get(scroller_edje,
+ "clipper");
+evas_object_clip_set(layout, clipper);
elm_layout_file_set(layout, EDJE_PATH, "ctrl_pt");
evas_object_show(layout);
elm_object_signal_emit(layout, "elm,state,hide,instance", "");
--
[EGIT] [tools/enventor] master 01/01: edj_viewer: add parts outline highlight feature
jaehyun pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=4100cc9131f7407765bf5b7aceb70a05c01872a1
commit 4100cc9131f7407765bf5b7aceb70a05c01872a1
Author: Taehyub Kim
Date: Tue Jun 28 14:20:57 2016 +0900
edj_viewer: add parts outline highlight feature
Summary:
When we add a live edit item, it is convenient to be support part outline.
so I added part outline feature. It can be toggling.
@T3626
Test Plan:
1. launch enventor
2. activate parts outline item on tools
3. see the parts outline in live edit view
Reviewers: Hermet, NikaWhite, bowonryu, Jaehyun_Cho
Reviewed By: Jaehyun_Cho
Differential Revision: https://phab.enlightenment.org/D4071
---
data/themes/default/content.edc | 14 ++
data/themes/default/images.edc | 2 +
data/themes/default/images/outline.png | Bin 0 -> 287 bytes
data/themes/default/images/part_outline.png | Bin 0 -> 3023 bytes
data/themes/default/layout_common.edc | 27 +++-
src/bin/config_data.c | 18 +++
src/bin/main.c | 9 ++
src/bin/tools.c | 42 +
src/include/config_data.h | 2 +
src/include/tools.h | 1 +
src/lib/Makefile.am | 3 +-
src/lib/edj_viewer.c| 14 ++
src/lib/enventor_object.eo | 9 ++
src/lib/enventor_private.h | 4 +
src/lib/enventor_smart.c| 20 +++
src/lib/outline_obj.c | 228
16 files changed, 391 insertions(+), 2 deletions(-)
diff --git a/data/themes/default/content.edc b/data/themes/default/content.edc
index 9dac898..e0cfcce 100644
--- a/data/themes/default/content.edc
+++ b/data/themes/default/content.edc
@@ -2,6 +2,7 @@ images {
image: "part_highlight.png" COMP;
image: "swallow.png" COMP;
image: "live_spacer.png" COMP;
+ image: "outline.png" COMP;
}
group { "swallow";
@@ -61,6 +62,19 @@ group { name: "part_highlight";
}
}
+group { "outline";
+ parts {
+ image { name: "img";
+ repeat_events: 1;
+ desc {
+image.normal: "outline.png";
+image.border: 3 3 2 4;
+fill.smooth: 0;
+ }
+ }
+ }
+}
+
group { "ctrl_pt";
parts {
rect { "clipper";
diff --git a/data/themes/default/images.edc b/data/themes/default/images.edc
index c0b165a..9b09c24 100644
--- a/data/themes/default/images.edc
+++ b/data/themes/default/images.edc
@@ -45,6 +45,7 @@ images {
image: "brows_sound.png" COMP;
image: "brows_font.png" COMP;
image: "template.png" COMP;
+ image: "part_outline.png" COMP;
}
#define ICON_GROUP(_group_name, _image_path) \
@@ -103,5 +104,6 @@ ICON_GROUP("brows_image", "brows_image.png")
ICON_GROUP("brows_sound", "brows_sound.png")
ICON_GROUP("brows_font", "brows_font.png")
ICON_GROUP("template", "template.png")
+ICON_GROUP("part_outline", "part_outline.png")
#undef ICON_GROUP
diff --git a/data/themes/default/images/outline.png
b/data/themes/default/images/outline.png
new file mode 100644
index 000..2ad35f1
Binary files /dev/null and b/data/themes/default/images/outline.png differ
diff --git a/data/themes/default/images/part_outline.png
b/data/themes/default/images/part_outline.png
new file mode 100644
index 000..fa12bd6
Binary files /dev/null and b/data/themes/default/images/part_outline.png differ
diff --git a/data/themes/default/layout_common.edc
b/data/themes/default/layout_common.edc
index 8bd879b..4e7d126 100644
--- a/data/themes/default/layout_common.edc
+++ b/data/themes/default/layout_common.edc
@@ -2613,7 +2613,7 @@ group { "live_view_tools_layout";
align: 0.0 0.5;
}
}
- swallow { "elm.swallow.mirror";
+ swallow { "elm.swallow.outline";
scale: 1;
desc { "default";
rel1 {
@@ -2625,6 +2625,31 @@ group { "live_view_tools_layout";
align: 0.0 0.5;
}
}
+ spacer { "padding_outline";
+ scale: 1;
+ desc { "default";
+rel1 {
+ to_x: "elm.swallow.outline";
+ relative: 1.0 0.0;
+}
+rel2.to_x: "elm.swallow.outline";
+min: 8 0;
+fixed: 1 0;
+align: 0.0 0.5;
+ }
+ }
+ swallow { "elm.swallow.mirror";
+ scale: 1;
+ desc { "default";
+rel1 {
+ to_x:
[EGIT] [tools/enventor] master 01/01: live_edit: change the description of fixed mode
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=dafc19ce3f6a8828d0710e6f47491fd595a3592f commit dafc19ce3f6a8828d0710e6f47491fd595a3592f Author: Taehyub Kim Date: Tue Jun 28 14:01:00 2016 +0900 live_edit: change the description of fixed mode Summary: change the description of fixed mode Test Plan: 1. click a live edit item on tools 2. see the description of fixed mode in live view Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet Reviewed By: Hermet Differential Revision: https://phab.enlightenment.org/D4106 --- src/bin/live_edit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c index f81c4ef..1a99a2f 100644 --- a/src/bin/live_edit.c +++ b/src/bin/live_edit.c @@ -2264,7 +2264,7 @@ live_edit_init(Evas_Object *parent) //Fixed Width Check Evas_Object *fixed_w_check = elm_check_add(fixed_box); elm_object_focus_allow_set(fixed_w_check, EINA_FALSE); - elm_object_text_set(fixed_w_check, "Fixed Width"); + elm_object_text_set(fixed_w_check, "Fixed width"); evas_object_smart_callback_add(fixed_w_check, "changed", fixed_check_changed_cb, ld); evas_object_show(fixed_w_check); @@ -2273,7 +2273,7 @@ live_edit_init(Evas_Object *parent) //Fixed Height Check Evas_Object *fixed_h_check = elm_check_add(fixed_box); elm_object_focus_allow_set(fixed_h_check, EINA_FALSE); - elm_object_text_set(fixed_h_check, "Fixed Height"); + elm_object_text_set(fixed_h_check, "Fixed height"); evas_object_smart_callback_add(fixed_h_check, "changed", fixed_check_changed_cb, ld); evas_object_show(fixed_h_check); --
[EGIT] [tools/enventor] master 01/01: build_setting: change the description of build setting
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=4ba5c36f910fdcb1d1afbf54bd33498627c63669
commit 4ba5c36f910fdcb1d1afbf54bd33498627c63669
Author: Taehyub Kim
Date: Tue Jun 28 13:59:05 2016 +0900
build_setting: change the description of build setting
Summary: change the description of build setting
Test Plan:
1. show the build setting
2. see the path title
Reviewers: Hermet, Jaehyun_Cho, NikaWhite, bowonryu
Differential Revision: https://phab.enlightenment.org/D4105
---
src/bin/build_setting.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/bin/build_setting.c b/src/bin/build_setting.c
index 2afb8c9..e2c2aa1 100644
--- a/src/bin/build_setting.c
+++ b/src/bin/build_setting.c
@@ -140,7 +140,7 @@ build_setting_content_get(build_setting_data *bsd,
Evas_Object *parent)
elm_object_focus_set(img_path_entry, EINA_TRUE);
elm_object_part_content_set(layout, "elm.swallow.img_path_entry",
img_path_entry);
- elm_layout_text_set(layout, "img_path_guide", _("Image Paths:"));
+ elm_layout_text_set(layout, "img_path_guide", _("Image paths:"));
//Image Path Tooltip
Evas_Object *img_path_tooltip = elm_button_add(layout);
@@ -158,7 +158,7 @@ build_setting_content_get(build_setting_data *bsd,
Evas_Object *parent)
(Eina_List *)config_snd_path_list_get());
elm_object_part_content_set(layout, "elm.swallow.snd_path_entry",
snd_path_entry);
- elm_layout_text_set(layout, "snd_path_guide", _("Sound Paths:"));
+ elm_layout_text_set(layout, "snd_path_guide", _("Sound paths:"));
//Sound Path Tooltip
Evas_Object *snd_path_tooltip = elm_button_add(layout);
@@ -176,7 +176,7 @@ build_setting_content_get(build_setting_data *bsd,
Evas_Object *parent)
(Eina_List *)config_fnt_path_list_get());
elm_object_part_content_set(layout, "elm.swallow.fnt_path_entry",
fnt_path_entry);
- elm_layout_text_set(layout, "fnt_path_guide", _("Font Paths:"));
+ elm_layout_text_set(layout, "fnt_path_guide", _("Font paths:"));
//Font Path Tooltip
Evas_Object *font_path_tooltip = elm_button_add(layout);
@@ -194,7 +194,7 @@ build_setting_content_get(build_setting_data *bsd,
Evas_Object *parent)
(Eina_List *)config_dat_path_list_get());
elm_object_part_content_set(layout, "elm.swallow.dat_path_entry",
dat_path_entry);
- elm_layout_text_set(layout, "dat_path_guide", _("Data Paths:"));
+ elm_layout_text_set(layout, "dat_path_guide", _("Data paths:"));
//Data Path Tooltip
Evas_Object *data_path_tooltip = elm_button_add(layout);
--
[EGIT] [tools/enventor] master 01/04: tools: change the description of window layout
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=2391268f5b09da0f6f116fcc5fb3d0078b374c32
commit 2391268f5b09da0f6f116fcc5fb3d0078b374c32
Author: Taehyub Kim
Date: Tue Jun 28 13:49:56 2016 +0900
tools: change the description of window layout
Summary: change the description of window layout
Test Plan:
1. move the mouse cursor on EDC Navigator and Status item of tools
2. see the tooltip messages
Reviewers: Hermet, Jaehyun_Cho, NikaWhite, bowonryu
Differential Revision: https://phab.enlightenment.org/D4098
---
src/bin/tools.c | 30 ++
1 file changed, 14 insertions(+), 16 deletions(-)
diff --git a/src/bin/tools.c b/src/bin/tools.c
index 46ecef6..7b40bcd 100644
--- a/src/bin/tools.c
+++ b/src/bin/tools.c
@@ -320,11 +320,10 @@ tools_init(Evas_Object *parent)
td->template_btn = btn;
btn = tools_btn_create(text_editor_ly, "console",
- _("Console Box (Alt + Down)"
-"Display Console box. Console box displays"
-"edc build logs such as error messages. It
pops"
-"up automatically when compliation errors are"
-"occurred."),
+ _("Console box (Alt + Down)"
+"Display the console box, which shows the EDC"
+"build logs, such as error messages. It pops"
+"up automatically when compliation errors occur."),
console_cb);
evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -332,8 +331,8 @@ tools_init(Evas_Object *parent)
td->console_btn = btn;
btn = tools_btn_create(text_editor_ly, "file_browser",
- _("File Browser (F9)"
- "Display File Browser which displays a file
list"
+ _("File browser (F9)"
+ "Display the file browser, which shows a file
list"
"in current workspace."),
file_browser_cb);
evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -342,10 +341,10 @@ tools_init(Evas_Object *parent)
td->file_browser_btn = btn;
btn = tools_btn_create(text_editor_ly, "edc_navigator",
- _("EDC Navigator (F10)"
-"Display EDC Navigator. EDC Navigator displays"
-"a current group hierarchy tree that contains"
-"parts, descriptions, programs lists"),
+ _("EDC navigator (F10)"
+"Display the EDC navigator, which shows the
current"
+"group hierarchy tree that contains parts,"
+"descriptions and programs lists."),
edc_navigator_cb);
evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -355,9 +354,8 @@ tools_init(Evas_Object *parent)
btn = tools_btn_create(text_editor_ly, "status",
_("Status (F11)"
-"Display Status bar on the bottom area."
-"Status bar displays subsidiary information
for"
-"editing."),
+"Display the status bar, which shows
subsidiary"
+"information for editing in the bottom area."),
status_cb);
evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -365,8 +363,8 @@ tools_init(Evas_Object *parent)
td->status_btn = btn;
btn = tools_btn_create(text_editor_ly, "menu",
- _("Enventor Menu (Esc)"
- "Open Enventor Main Menu."),
+ _("Enventor menu (Esc)"
+ "Open the Enventor main menu."),
menu_cb);
elm_object_tooltip_orient_set(btn, ELM_TOOLTIP_ORIENT_BOTTOM_LEFT);
evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
--
[EGIT] [tools/enventor] master 03/04: edc_navigator: change the EDC Navigator description
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=9ed825cdb71b645e9252d2695d0ed0bd7cf28d38 commit 9ed825cdb71b645e9252d2695d0ed0bd7cf28d38 Author: Taehyub Kim Date: Tue Jun 28 13:52:21 2016 +0900 edc_navigator: change the EDC Navigator description Summary: change the description Test Plan: 1. Open basic.edc template 2. remove the annotation of program part 3. Show EDC Navigator 4. move the mouse cursor on the button of Program which have rectangle icon. 5. move the mouse cursor on the button of program which have triangle icon. 6. see the each tooltip messages. Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet Reviewed By: Hermet Differential Revision: https://phab.enlightenment.org/D4102 --- src/bin/edc_navigator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/edc_navigator.c b/src/bin/edc_navigator.c index e044dde..6402eab 100644 --- a/src/bin/edc_navigator.c +++ b/src/bin/edc_navigator.c @@ -817,7 +817,7 @@ gl_program_content_get_cb(void *data EINA_UNUSED, Evas_Object *obj, //Box Evas_Object *box = elm_box_add(obj); - elm_object_tooltip_text_set(box, "Play Program"); + elm_object_tooltip_text_set(box, "Play the program."); //Button Evas_Object *btn = elm_button_add(box); @@ -1059,7 +1059,7 @@ gl_programs_content_get_cb(void *data EINA_UNUSED, Evas_Object *obj, //2. Stop All Button //Box Evas_Object *box = elm_box_add(obj); - elm_object_tooltip_text_set(box, "Stop All Programs"); + elm_object_tooltip_text_set(box, "Stop all programs."); //Button Evas_Object *btn = elm_button_add(box); --
[EGIT] [tools/enventor] master 02/04: preference_setting: change the description
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=3690f6d012d9525e48bb3cc7a46fe22931cbc3ba
commit 3690f6d012d9525e48bb3cc7a46fe22931cbc3ba
Author: Taehyub Kim
Date: Tue Jun 28 13:51:42 2016 +0900
preference_setting: change the description
Summary: change the description
Test Plan:
1. open setting menue
2. move the mouse cursor on View Size, Auto Hiding Console, Smart Undo/Redo
and Error Message Alert
3. see the tooltip messages
Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet
Reviewed By: Hermet
Differential Revision: https://phab.enlightenment.org/D4099
---
src/bin/preference_setting.c | 45 +---
1 file changed, 21 insertions(+), 24 deletions(-)
diff --git a/src/bin/preference_setting.c b/src/bin/preference_setting.c
index dd25e44..2ce69a2 100644
--- a/src/bin/preference_setting.c
+++ b/src/bin/preference_setting.c
@@ -156,7 +156,7 @@ preference_setting_content_get(preference_setting_data *psd,
elm_box_pack_end(box, box2);
elm_object_tooltip_text_set(box2,
- _("Set current live view size."));
+ _("Set the size of the current live view."));
//Label (View Size)
/* This layout is intended to put the label aligned to left side
@@ -227,7 +227,7 @@ preference_setting_content_get(preference_setting_data *psd,
toggle_create(box, _("Tools"),
config_tools_get(),
_("Tools (F7)"
- "Display Tools on the top area."
+ "Display the tools on the top area."
"Tools displays the essential function "
"toggles to edit the layout."));
elm_box_pack_end(box, toggle_tools);
@@ -244,49 +244,46 @@ preference_setting_content_get(preference_setting_data
*psd,
//Toggle (Console)
Evas_Object *toggle_console =
toggle_create(box, _("Auto Hiding Console"), config_console_get(),
-_("Hide Console box automatically"
- "when no messages. If you fixed"
- "all grammatic edc errors so the error"
- "messages has gone, Console box will"
- "be disappeared automatically."));
+_("Hide the console box automatically"
+ "when no messages are to be shown."
+ "for example, when you have fixed all"
+ "grammatical errors."));
elm_box_pack_end(box, toggle_console);
//Toggle (Auto Indentation)
Evas_Object *toggle_indent =
toggle_create(box, _("Auto Indentation"), config_auto_indent_get(),
-_("Auto Indentation (Ctrl + I)"
- "Apply auto indentation for text editing."
- "When wrapping the text around,"
- "Enventor inserts spaces automatically"
- "for the line indentation"));
+_("Auto indentation (Ctrl + I)"
+ "Apply automatic indentation for text editing."
+ "When wrapping the text around, Enventor"
+ "inserts the line indentation automatically."));
elm_box_pack_end(box, toggle_indent);
//Toggle (Auto Completion)
Evas_Object *toggle_autocomp =
toggle_create(box, _("Auto Completion"), config_auto_complete_get(),
-_("Auto Completion (Ctrl + O)"
- "Display candidate keywords popup with"
+_("Auto completion (Ctrl + O)"
+ "Display the candidate keyword popup with"
"regards to the current editing contxt."
- "When you type texts in editor, candidate"
- "popup will be popped. Once you choose one"
- "of items in it, template code with regards"
- "to the item will be inserted."));
+ "When you type texts in the editor, the candidate"
+ "popup appears. You can choose an item"
+ "from the list, and a code template is inserted."));
elm_box_pack_end(box, toggle_autocomp);
//Toggle (Smart Undo/Redo)
Evas_Object *toggle_smart_undo_redo =
toggle_create(box, _("Smart Undo/Redo"), config_smart_undo_redo_get(),
-_("Redo/Undo text by word. Otherwise, it"
-
[EGIT] [tools/enventor] master 04/04: tools: change the description for the tools of live edit mode
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=964a57936fbb7aecb860a3426d47e7c789eece3d
commit 964a57936fbb7aecb860a3426d47e7c789eece3d
Author: Taehyub Kim
Date: Tue Jun 28 13:53:12 2016 +0900
tools: change the description for the tools of live edit mode
Summary: change the descrtipion for the tools for live edit mode
Test Plan:
1. move the mouse cursor on part highlighting, dummy parts and mirror mode
tools
2. see the tooltip messages
Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet
Reviewed By: Hermet
Differential Revision: https://phab.enlightenment.org/D4103
---
src/bin/tools.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/bin/tools.c b/src/bin/tools.c
index 7b40bcd..1aaa63a 100644
--- a/src/bin/tools.c
+++ b/src/bin/tools.c
@@ -198,9 +198,9 @@ tools_init(Evas_Object *parent)
Evas_Object *btn;
btn = tools_btn_create(live_view_ly, "highlight",
- _("Part Highlighting (Ctrl + H)"
-"Highlight effect on the selected part in the"
-"live view."),
+ _("Part highlighting (Ctrl + H)"
+"Show a highlight effect on the selected part"
+"in the live view."),
highlight_cb);
elm_object_tooltip_orient_set(btn, ELM_TOOLTIP_ORIENT_BOTTOM_RIGHT);
evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -209,7 +209,7 @@ tools_init(Evas_Object *parent)
td->highlight_btn = btn;
btn = tools_btn_create(live_view_ly, "dummy",
- _("Dummy Parts (Ctrl + W)"
+ _("Dummy parts (Ctrl + W)"
"Display virtual images for the swallow and"
"spacer parts."),
dummy_cb);
@@ -220,10 +220,10 @@ tools_init(Evas_Object *parent)
td->swallow_btn = btn;
btn = tools_btn_create(live_view_ly, "mirror",
- _("Mirror Mode (Ctrl + M)"
-"Invert layout horizontally. This previews "
-"design layout for the environemnt, RTL(Right"
-"to Left)/LTR(Left to Right) setting."),
+ _("Mirror mode (Ctrl + M)"
+"Invert the layout horizontally and review"
+"the designed layout in RTL(right-to-left)"
+"LTR(left-to-right) settings."),
mirror_cb);
evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
--
[EGIT] [tools/enventor] master 01/02: tools: change the editing tools description
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=8a6b7163cbab6e05d3322f464b1921ce8fb0c6a3
commit 8a6b7163cbab6e05d3322f464b1921ce8fb0c6a3
Author: Taehyub Kim
Date: Tue Jun 28 13:47:35 2016 +0900
tools: change the editing tools description
Summary: change the Find/Replace description
Test Plan:
1. move the mouse cursor on Find/Replace tools
2. see the tooltip message
Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet
Reviewed By: Hermet
Differential Revision: https://phab.enlightenment.org/D4096
---
src/bin/tools.c | 29 ++---
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/src/bin/tools.c b/src/bin/tools.c
index d3e9f4a..46ecef6 100644
--- a/src/bin/tools.c
+++ b/src/bin/tools.c
@@ -258,22 +258,22 @@ tools_init(Evas_Object *parent)
EVAS_HINT_FILL);
btn = tools_btn_create(text_editor_ly, "save",
- _("Save File (Ctrl + S)"
-"Save current script to file."),
+ _("Save the file (Ctrl + S)"
+"Save the current script to a file."),
save_cb);
evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_part_content_set(text_editor_ly, "elm.swallow.save", btn);
btn = tools_btn_create(text_editor_ly, "undo",
- _("Undo Text (Ctrl + Z)"),
+ _("Undo text (Ctrl + Z)"),
undo_cb);
evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_part_content_set(text_editor_ly, "elm.swallow.undo", btn);
btn = tools_btn_create(text_editor_ly, "redo",
- _("Redo Text (Ctrl + R)"),
+ _("Redo text (Ctrl + R)"),
redo_cb);
evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -281,8 +281,7 @@ tools_init(Evas_Object *parent)
btn = tools_btn_create(text_editor_ly, "find",
_("Find/Replace (Ctrl + F)"
-"Open Find/Replace window to find or"
-"replace text."),
+"Find or replace text."),
find_cb);
evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -290,8 +289,8 @@ tools_init(Evas_Object *parent)
td->find_btn = btn;
btn = tools_btn_create(text_editor_ly, "goto",
- _("Goto Lines (Ctrl + L)"
-"Open Goto window to move the cursor"
+ _("Go to line (Ctrl + L)"
+"Open the Go to window to move the cursor"
"line position."),
goto_cb);
evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -300,8 +299,8 @@ tools_init(Evas_Object *parent)
td->goto_btn = btn;
btn = tools_btn_create(text_editor_ly, "lines",
- _("Line Numbers (F5)"
-"Display script line number."),
+ _("Line numbers (F5)"
+"Display the script line numbers."),
lines_cb);
evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -309,11 +308,11 @@ tools_init(Evas_Object *parent)
td->lines_btn = btn;
btn = tools_btn_create(text_editor_ly, "template",
- _("Insert Code Snippet (Ctrl + T)"
-"Enventor decides best template code with"
-"regards to the current editing context. For"
-"instance, if the cursor is inside of part "
-"section, description code will be generated."),
+ _("Insert a code snippet (Ctrl + T)"
+"Enventor chooses the best code with regards"
+"to the current editing context. For instance,"
+"if the cursor is inside a part section,"
+"description code is generated."),
template_cb);
evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
--
[EGIT] [tools/enventor] master 02/02: statusbar: change the description
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=f1d5e5605dd9b29aa975e295eff70e805e070175
commit f1d5e5605dd9b29aa975e295eff70e805e070175
Author: Taehyub Kim
Date: Tue Jun 28 13:48:37 2016 +0900
statusbar: change the description
Summary: change the description
Test Plan:
1. move the mouse cursor on each statusbar item
(Resize, Swap and Group)
2. see the tooltip messages
Reviewers: Hermet, Jaehyun_Cho, NikaWhite, bowonryu
Differential Revision: https://phab.enlightenment.org/D4097
---
src/bin/statusbar.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/bin/statusbar.c b/src/bin/statusbar.c
index 4e14c0e..4271370 100644
--- a/src/bin/statusbar.c
+++ b/src/bin/statusbar.c
@@ -319,18 +319,18 @@ stats_init(Evas_Object *parent)
//View Scale button
create_statusbar_btn(layout, "expand", "scale_btn",
-_("View Zoom Level (Ctrl + Mouse Wheel)"
- "Zooming live view in or out."),
+_("View zoom level (Ctrl + Mouse Wheel)"
+ "Zoom the live view in or out."),
ELM_TOOLTIP_ORIENT_TOP_RIGHT,
view_scale_btn_cb, sd);
//View Resize Button
create_statusbar_btn(layout, "expand", "resize_btn",
-_("Resize live view width and height."),
+_("Resize the width and height of the live view."),
ELM_TOOLTIP_ORIENT_TOP,
view_resize_btn_cb, sd);
//View Invert Button
create_statusbar_btn(layout, "invert", "invert_btn",
-_("Swap the live view width and height."),
+_("Swap the width and height of the live view."),
ELM_TOOLTIP_ORIENT_TOP,
view_invert_btn_cb, sd);
@@ -341,7 +341,7 @@ stats_init(Evas_Object *parent)
arrow_tooltip);
elm_object_tooltip_text_set(arrow_tooltip,
_("Mouse cursor position in live view."
- "Absolute Coordinate | Relative
Coordinate"));
+ "Absolute coordinate | Relative
coordinate."));
elm_object_tooltip_orient_set(arrow_tooltip, ELM_TOOLTIP_ORIENT_TOP);
elm_object_focus_allow_set(arrow_tooltip, EINA_FALSE);
@@ -351,7 +351,7 @@ stats_init(Evas_Object *parent)
elm_object_part_content_set(layout, "elm.swallow.group_icon.tooltip",
group_tooltip);
elm_object_tooltip_text_set(group_tooltip,
- _("Current editing group name."));
+ _("Name of the current editing group."));
elm_object_tooltip_orient_set(group_tooltip, ELM_TOOLTIP_ORIENT_TOP);
elm_object_focus_allow_set(group_tooltip, EINA_FALSE);
--
[EGIT] [tools/enventor] master 01/01: live_edit: change the description
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=ea0ba27adab2d85a13184aeaa593d5613ce58a7d
commit ea0ba27adab2d85a13184aeaa593d5613ce58a7d
Author: Taehyub Kim
Date: Tue Jun 28 13:44:40 2016 +0900
live_edit: change the description
Summary: change the description
Test Plan:
1. move the mouse cursor on each live edit item
2. see the tooltip messages
Reviewers: Hermet, NikaWhite, Jaehyun_Cho, bowonryu
Differential Revision: https://phab.enlightenment.org/D4095
---
src/bin/live_edit.c | 37 +
1 file changed, 17 insertions(+), 20 deletions(-)
diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index bff1313..f81c4ef 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -2069,42 +2069,39 @@ live_btn_create(Evas_Object *parent, const char *name,
void * data,
case EDJE_PART_TYPE_RECTANGLE:
elm_object_tooltip_text_set(btn,
_("Add a Rect to the live view."
- "Rect is used for a solid color"
- "component or clipping other"
- "components."));
+ "A Rect part is used as a solid
color"
+ "component or clipping other
components."));
break;
case EDJE_PART_TYPE_TEXT:
elm_object_tooltip_text_set(btn,
- _("Add a Text to the live view."
- "Text is used for a plain text"));
+ _("Add a Text part to the live view."
+ "A Text part is used for plain text."));
break;
case EDJE_PART_TYPE_IMAGE:
elm_object_tooltip_text_set(btn,
- _("Add an Image to the live view."
- "Image is used for an image part"
- "which contains a single image"
- "resource. Normally, an image file."));
+ _("Add an Image part to the live
view."
+ "An Image part contains a single
image"
+ "resource, usually an image file."));
break;
case EDJE_PART_TYPE_SWALLOW:
elm_object_tooltip_text_set(btn,
- _("Add a Swallow to the live view."
- "Swallow is a place holder for"
- "objects that one may want to"
+ _("Add a Swallow part to the live
view."
+ "A Swallow part is a placeholder
for"
+ "objects that you may want to"
"include in the layout later."));
break;
case EDJE_PART_TYPE_TEXTBLOCK:
elm_object_tooltip_text_set(btn,
- _("Add a Textblock to the live view."
- "Textblock represents a rich-text"
- "part that can show big chunks of"
- "text."));
+ _("Add a Textblock part to the live
view."
+ "A Textblock part is a rich-text
part"
+ "that can show big chunks of text."));
break;
case EDJE_PART_TYPE_SPACER:
elm_object_tooltip_text_set(btn,
- _("Add a Spacer to the live view."
- "Spacer is an anchor to locate "
- "other parts. It's invisible so"
- "normally used for a padding."));
+ _("Add a Spacer part to the live
view."
+ "A Spacer part is an anchor to locate
"
+ "other parts. It is invisible and"
+ "normally used for padding."));
break;
default:
break;
--
[EGIT] [tools/enventor] master 01/01: tools: change the description
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=0e925d231bf5b9c8dd748172f124eaf75866e4e6
commit 0e925d231bf5b9c8dd748172f124eaf75866e4e6
Author: Taehyub Kim
Date: Tue Jun 28 13:43:02 2016 +0900
tools: change the description
Summary: change the description
Test Plan:
1. toggle dummy parts, mirror mode and parth highlighting
2. see the result
Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet
Reviewed By: Hermet
Differential Revision: https://phab.enlightenment.org/D4094
---
src/bin/tools.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/bin/tools.c b/src/bin/tools.c
index 2fa23a3..d3e9f4a 100644
--- a/src/bin/tools.c
+++ b/src/bin/tools.c
@@ -412,9 +412,9 @@ tools_highlight_update(Eina_Bool toggle)
if (toggle)
{
if (config_part_highlight_get())
- stats_info_msg_update(_("Part Highlighting Enabled."));
+ stats_info_msg_update(_("Part highlighting enabled."));
else
- stats_info_msg_update(_("Part Highlighting Disabled."));
+ stats_info_msg_update(_("Part highlighting disabled."));
}
//Toggle on/off
@@ -499,9 +499,9 @@ tools_dummy_update(Eina_Bool toggle)
if (toggle)
{
if (config_dummy_parts_get())
- stats_info_msg_update(_("Dummy Parts Enabled."));
+ stats_info_msg_update(_("Dummy parts enabled."));
else
- stats_info_msg_update(_("Dummy Parts Disabled."));
+ stats_info_msg_update(_("Dummy parts disabled."));
}
//Toggle on/off
if (config_dummy_parts_get())
@@ -524,9 +524,9 @@ tools_mirror_mode_update(Eina_Bool toggle)
if (toggle)
{
if (config_mirror_mode_get())
- stats_info_msg_update(_("Mirror Mode Enabled."));
+ stats_info_msg_update(_("Mirror mode enabled."));
else
- stats_info_msg_update(_("Mirror Mode Disabled."));
+ stats_info_msg_update(_("Mirror mode disabled."));
}
//Toggle on/off
--
[EGIT] [tools/enventor] master 01/01: menu: change the description
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=3163a95f82efcd1e8c07bb6dc5859b8252da025f
commit 3163a95f82efcd1e8c07bb6dc5859b8252da025f
Author: Taehyub Kim
Date: Sat Jun 25 12:32:47 2016 +0900
menu: change the description
Summary: change the description
Test Plan:
1. input some text into text view
2. click x button of enventor window
3. see the popup message
Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet
Reviewed By: Hermet
Differential Revision: https://phab.enlightenment.org/D4092
---
src/bin/menu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/menu.c b/src/bin/menu.c
index 6a22630..b354637 100644
--- a/src/bin/menu.c
+++ b/src/bin/menu.c
@@ -172,9 +172,9 @@ warning_open(menu_data *md, Evas_Smart_Cb yes_cb,
Evas_Smart_Cb save_cb)
Evas_Object *layout = elm_layout_add(base_win_get());
elm_layout_file_set(layout, EDJE_PATH, "warning_layout");
elm_object_part_text_set(layout, "elm.text.desc",
-_("Without save, you will lose last changes!"));
+_("You have unsaved changes."));
elm_object_part_text_set(layout, "elm.text.question",
-_("Will you save changes?"));
+_("Do you want to save the changes?"));
elm_object_signal_callback_add(layout, "elm,state,dismiss,done", "",
warning_dismiss_done, md);
evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
--
[EGIT] [tools/enventor] master 02/02: search: change the description
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=b8a1b8865f3298905f73a4ae66ca19487fb95ef8
commit b8a1b8865f3298905f73a4ae66ca19487fb95ef8
Author: Taehyub Kim
Date: Sat Jun 25 12:27:57 2016 +0900
search: change the description
Summary: change the description
Test Plan:
1. open search window
2. see the text
Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet
Reviewed By: Hermet
Differential Revision: https://phab.enlightenment.org/D4090
---
data/themes/default/layout_common.edc | 2 +-
src/bin/search.c | 8
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/data/themes/default/layout_common.edc
b/data/themes/default/layout_common.edc
index 3bbeb5d..7716d5c 100644
--- a/data/themes/default/layout_common.edc
+++ b/data/themes/default/layout_common.edc
@@ -1077,7 +1077,7 @@ group { name: "search_layout";
font: FN;
size: 10;
align: 0 0.5;
- text: "Forward";
+ text: "Next";
}
color: COL_HI;
min: 80 30;
diff --git a/src/bin/search.c b/src/bin/search.c
index 4fd5cbc..de21277 100644
--- a/src/bin/search.c
+++ b/src/bin/search.c
@@ -230,7 +230,7 @@ backward_clicked_cb(void *data, Evas_Object *obj
EINA_UNUSED,
search_data *sd = data;
find_backward_proc(sd);
sd->forward = EINA_FALSE;
- elm_object_part_text_set(sd->layout, "elm.text.dir", _("Backward"));
+ elm_object_part_text_set(sd->layout, "elm.text.dir", _("Previous"));
}
static void
@@ -262,7 +262,7 @@ forward_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
search_data *sd = data;
find_forward_proc(sd);
sd->forward = EINA_TRUE;
- elm_object_part_text_set(sd->layout, "elm.text.dir", _("Forward"));
+ elm_object_part_text_set(sd->layout, "elm.text.dir", _("Next"));
}
static void
@@ -389,14 +389,14 @@ search_open(void)
entry_replace);
//Button (forward)
Evas_Object *btn_forward = elm_button_add(layout);
- elm_object_text_set(btn_forward, _("Forward"));
+ elm_object_text_set(btn_forward, _("Next"));
evas_object_smart_callback_add(btn_forward, "clicked", forward_clicked_cb,
sd);
elm_object_part_content_set(layout, "elm.swallow.forward", btn_forward);
//Button (backward)
Evas_Object *btn_backward = elm_button_add(layout);
- elm_object_text_set(btn_backward, _("Backward"));
+ elm_object_text_set(btn_backward, _("Previous"));
evas_object_smart_callback_add(btn_backward, "clicked",
backward_clicked_cb, sd);
elm_object_part_content_set(layout, "elm.swallow.backward",
--
[EGIT] [tools/enventor] master 01/02: ctxpopup: apply coding convention
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=a9c1c62cbe3c2245b48ea92085aecb487a9a9c53 commit a9c1c62cbe3c2245b48ea92085aecb487a9a9c53 Author: Taehyub Kim Date: Sat Jun 25 12:27:08 2016 +0900 ctxpopup: apply coding convention Summary: apply codinf convention @fix Reviewers: Hermet, Jaehyun_Cho, NikaWhite Differential Revision: https://phab.enlightenment.org/D4085 --- src/lib/ctxpopup.c | 39 ++- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/src/lib/ctxpopup.c b/src/lib/ctxpopup.c index 262cd02..6b234ca 100644 --- a/src/lib/ctxpopup.c +++ b/src/lib/ctxpopup.c @@ -361,7 +361,8 @@ colorselector_changed_cb(void *data, Evas_Object *obj EINA_UNUSED, elm_spinner_value_set(ctxdata->input_colors[2], b); elm_spinner_value_set(ctxdata->input_colors[3], a); - evas_object_color_set(ctxdata->color_view, (r * a) / 255 , (g * a) / 255, (b * a) / 255, a); + evas_object_color_set(ctxdata->color_view, (r * a) / 255 , + (g * a) / 255, (b * a) / 255, a); ecore_animator_del(ctxdata->animator); snprintf(ctxdata->candidate, sizeof(ctxdata->candidate), ": %d %d %d %d;", @@ -388,7 +389,8 @@ colorselector_inputs_changed_cb(void *data, Evas_Object *obj EINA_UNUSED, b = elm_spinner_value_get(ctxdata->input_colors[2]); a = elm_spinner_value_get(ctxdata->input_colors[3]); - evas_object_color_set(ctxdata->color_view, (r * a) /255 , (g * a)/255, (b * a)/255, a); + evas_object_color_set(ctxdata->color_view, (r * a) /255 , (g * a)/255, + (b * a)/255, a); elm_colorselector_color_set(ctxdata->colorselector, r, g, b, a); ecore_animator_del(ctxdata->animator); @@ -418,7 +420,8 @@ colorselector_preset_clicked_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *o b = preset_colors.rgba[index].b; a = preset_colors.rgba[index].a; - evas_object_color_set(ctxdata->color_view, (r * a)/255 , (g * a)/255, (b * a)/255, a); + evas_object_color_set(ctxdata->color_view, (r * a)/255 , (g * a)/255, + (b * a)/255, a); elm_colorselector_color_set(ctxdata->colorselector, r, g, b, a); elm_spinner_value_set(ctxdata->input_colors[0], r); @@ -460,15 +463,21 @@ colorselector_layout_create(Evas_Object *ctxpopup, ctxpopup_data *ctxdata) //Colorselector ctxdata->colorselector = elm_colorselector_add(layout); elm_colorselector_color_set(ctxdata->colorselector, r, g, b, a); - elm_colorselector_mode_set(ctxdata->colorselector, ELM_COLORSELECTOR_COMPONENTS); - evas_object_size_hint_weight_set(ctxdata->colorselector, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(ctxdata->colorselector, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_object_part_content_set(layout, "elm.swallow.colorselector", ctxdata->colorselector); - evas_object_smart_callback_add(ctxdata->colorselector, "changed", colorselector_changed_cb, ctxdata); + elm_colorselector_mode_set(ctxdata->colorselector, + ELM_COLORSELECTOR_COMPONENTS); + evas_object_size_hint_weight_set(ctxdata->colorselector, +EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(ctxdata->colorselector, + EVAS_HINT_FILL, EVAS_HINT_FILL); + elm_object_part_content_set(layout, "elm.swallow.colorselector", + ctxdata->colorselector); + evas_object_smart_callback_add(ctxdata->colorselector, "changed", + colorselector_changed_cb, ctxdata); //Color View ctxdata->color_view = evas_object_rectangle_add(evas_object_evas_get(layout)); - evas_object_color_set(ctxdata->color_view, (r * a) / 255 , (g * a) / 255, (b * a) / 255, a); + evas_object_color_set(ctxdata->color_view, (r * a) / 255 , (g * a) / 255, + (b * a) / 255, a); evas_object_show(ctxdata->color_view); elm_object_part_content_set(layout, "elm.swallow.color_view", ctxdata->color_view); @@ -490,10 +499,13 @@ colorselector_layout_create(Evas_Object *ctxpopup, ctxpopup_data *ctxdata) elm_spinner_step_set(ctxdata->input_colors[i], 1.0); elm_spinner_min_max_set(ctxdata->input_colors[i], 0, 255); elm_spinner_value_set(ctxdata->input_colors[i], ctxdata->attr->val[i]); -evas_object_size_hint_align_set(ctxdata->input_colors[i], EVAS_HINT_FILL, 0.5); -evas_object_size_hint_weight_set(ctxdata->input_colors[i], EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); +evas_object_size_hint_align_set(ctxdata->input_colors[i], +EVAS_HINT_FILL, 0.5); +e
[EGIT] [tools/enventor] master 01/01: menu: apply coding convention
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=6a55ec38b8ad68dc61e60c7e3633f116c15595c5
commit 6a55ec38b8ad68dc61e60c7e3633f116c15595c5
Author: Taehyub Kim
Date: Sat Jun 25 12:26:20 2016 +0900
menu: apply coding convention
Summary:
apply coding convention
@fix
Reviewers: Jaehyun_Cho, NikaWhite, Hermet
Reviewed By: Hermet
Differential Revision: https://phab.enlightenment.org/D4084
---
src/bin/menu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/menu.c b/src/bin/menu.c
index 6562cb3..6a22630 100644
--- a/src/bin/menu.c
+++ b/src/bin/menu.c
@@ -121,7 +121,7 @@ newfile_cancel_btn_cb(void *data, Evas_Object *obj
EINA_UNUSED,
static void
menu_back_btn_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
- void *envent_info EINA_UNUSED)
+ void *envent_info EINA_UNUSED)
{
menu_data *md = data;
menu_close(md);
--
[EGIT] [tools/enventor] master 01/01: live_edit: apply coding convention
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=b8b65b0d3e086a747b216ac669c35ae605e107cc
commit b8b65b0d3e086a747b216ac669c35ae605e107cc
Author: Taehyub Kim
Date: Sat Jun 25 12:25:14 2016 +0900
live_edit: apply coding convention
Summary:
the line is over than 80 character.
@fix
Reviewers: Hermet, Jaehyun_Cho, NikaWhite
Differential Revision: https://phab.enlightenment.org/D4083
---
src/bin/live_edit.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index 7e7f838..bff1313 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -2048,7 +2048,10 @@ live_btn_clicked_cb(void *data, Evas_Object *obj
EINA_UNUSED,
live_edit_layer_set(ld);
- stats_info_msg_update(_("Double click part to confirm. (Esc = cancel,
Direction Key = move item per pixel, Ctrl = disable auto-aligning)"));
+ stats_info_msg_update(_("Double click part to confirm."
+ "(Esc = cancel, Direction Key ="
+ " move item per pixel,"
+ "Ctrl = disable auto-aligning)"));
}
static Evas_Object *
--
[EGIT] [tools/enventor] master 01/01: edc_editor: rearrange selected part to be placed in center
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=4f4da34c9b3ab7ca6261341be73ac9b7972bb757
commit 4f4da34c9b3ab7ca6261341be73ac9b7972bb757
Author: Taehyub Kim
Date: Mon Jun 20 13:10:36 2016 +0900
edc_editor: rearrange selected part to be placed in center
Summary:
When we search the word or click part in live edit view and edc navigator,
The corresponding name in text view is selected, but it is not center align.
So I make it center align when the word is selected.
@T3326
Test Plan:
1. launch enventor
2. open search window
3. input any word in script
4. click ok forward button
5. check selection part if it is placed in center
6. click a part in live edit view
7. check selection part if it is placed in center
8. click a part name in edc navigator
9. check selection part if it is placed in center
Reviewers: Hermet, Jaehyun_Cho, NikaWhite, bowonryu
Differential Revision: https://phab.enlightenment.org/D4059
---
src/lib/edc_editor.c | 40 +++-
src/lib/enventor_private.h | 2 ++
src/lib/enventor_smart.c | 3 +--
3 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index 37de60f..0d016ad 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -1154,7 +1154,7 @@ finish:
{
int cur_pos = part_pos - utf8 + 1;
elm_entry_select_none(ed->en_edit);
-elm_entry_select_region_set(ed->en_edit, cur_pos, cur_pos +
strlen(part_name));
+edit_selection_region_center_set(ed, cur_pos, cur_pos +
strlen(part_name));
}
free(utf8);
@@ -1744,4 +1744,42 @@ edit_key_up_event_dispatch(edit_data *ed, const char
*key)
return EINA_FALSE;
}
+void
+edit_selection_region_center_set(edit_data *ed, int start, int end)
+{
+ Evas_Coord region_y, region_h;
+ Evas_Coord cursor_y, cursor_h;
+
+ //Calculate line of selection region
+ elm_entry_cursor_pos_set(ed->en_edit, start);
+ elm_entry_cursor_geometry_get(ed->en_edit, NULL, &cursor_y, NULL,
&cursor_h);
+ int cur_line = (cursor_y / cursor_h) + 1;
+
+ //Calculate current region of scroller
+ elm_scroller_region_get(ed->scroller, NULL, ®ion_y, NULL, ®ion_h);
+
+
+ int line;
+ //Case 1: selection region is above the centor of scroller region
+ if (((region_y + (region_h / 2))) > cursor_y)
+ {
+line = cur_line - (int)((region_h / cursor_h) / 2);
+if (line < 1) line = 1;
+ }
+ //Case 2: selection region is below the center of scroller region
+ else
+ {
+line = cur_line + 2 + (int)((region_h / cursor_h) / 2);
+if (line > ed->line_max) line = ed->line_max;
+ }
+ //Move the scroller for selection align
+ Evas_Object *tb = elm_entry_textblock_get(ed->en_edit);
+ Evas_Textblock_Cursor *cur = evas_object_textblock_cursor_get(tb);
+ evas_textblock_cursor_line_set(cur, (line - 1));
+ elm_entry_cursor_geometry_get(ed->en_edit, NULL, ®ion_y, NULL, NULL);
+ elm_scroller_region_show(ed->scroller, 0, region_y, 0, 0);
+
+ //Select region
+ elm_entry_select_region_set(ed->en_edit, start, end);
+}
diff --git a/src/lib/enventor_private.h b/src/lib/enventor_private.h
index 0a551b6..bf76ac5 100644
--- a/src/lib/enventor_private.h
+++ b/src/lib/enventor_private.h
@@ -270,4 +270,6 @@ void edit_error_set(edit_data *ed, int line, const char
*target);
void edit_text_insert(edit_data *ed, const char *text);
void edit_part_cursor_set(edit_data *ed, const char *group_name, const char
*part_name);
redoundo_data *edit_redoundo_get(edit_data *ed);
+void edit_selection_region_center_set(edit_data *ed, int start, int end);
+
#endif
diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c
index e947467..1e838a5 100644
--- a/src/lib/enventor_smart.c
+++ b/src/lib/enventor_smart.c
@@ -695,8 +695,7 @@ _enventor_object_select_region_set(Eo *obj EINA_UNUSED,
Enventor_Object_Data *pd, int start, int
end)
{
edit_selection_clear(pd->main_it.ed);
- elm_entry_cursor_pos_set(edit_entry_get(pd->main_it.ed), start);
- elm_entry_select_region_set(edit_entry_get(pd->main_it.ed), start, end);
+ edit_selection_region_center_set(pd->main_it.ed, start, end);
}
EOLIAN static void
--
[EGIT] [tools/enventor] master 01/01: live_edit: refactoring setting relative features
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=04edb800e26a707cb906136066017e082db0feff
commit 04edb800e26a707cb906136066017e082db0feff
Author: Taehyub Kim
Date: Mon Jun 20 12:12:10 2016 +0900
live_edit: refactoring setting relative features
Summary:
There are some hole cases.
For example, if we want to input fixed part
then we had to check fixed option first.
but now, we can input fixed part in any order.
In addition, Unnecessary codes are removed
and added more comments.
Test Plan:
1. launch envnetor.
2. make a live edit item by clicking live edit item on tools.
3. set relatives for the live edit item.
4. double click and insert the item.
5. see the result.
Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet
Differential Revision: https://phab.enlightenment.org/D4047
---
src/bin/live_edit.c | 302 +++-
1 file changed, 131 insertions(+), 171 deletions(-)
diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index b5fbc81..7e7f838 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -102,7 +102,6 @@ typedef struct auto_align_data_s
typedef struct rel_to_data_s
{
char part_name[PART_NAME_MAX];
- int is_rel_to_x, is_rel_to_y;
float rel_x, rel_y;
Evas_Coord_Point pt1, pt2;
live_data *ld;
@@ -333,53 +332,88 @@ live_edit_symbol_set(live_data *ld)
}
static void
-live_edit_insert(live_data *ld)
+calc_relative_info(live_data *ld)
{
- int type = LIVEEDIT_ITEMS[ld->type].type;
+ //For Current Input Live Edit Item size
+ Evas_Coord lx, ly, lw, lh;
+ evas_object_geometry_get(ld->layout, &lx, &ly, &lw, &lh);
- //Set relative_to values
- if (!ld->rel_to_info.rel1_x_part)
- ld->rel_to_info.rel1_x = ld->rel_info.rel1_x;
- if (!ld->rel_to_info.rel1_y_part)
- ld->rel_to_info.rel1_y = ld->rel_info.rel1_y;
- if (!ld->rel_to_info.rel2_x_part)
- ld->rel_to_info.rel2_x = ld->rel_info.rel2_x;
- if (!ld->rel_to_info.rel2_y_part)
- ld->rel_to_info.rel2_y = ld->rel_info.rel2_y;
+ //Check fixed properties
+ Eina_Bool fixed_w = elm_check_state_get(ld->fixed_w_check);
+ Eina_Bool fixed_h = elm_check_state_get(ld->fixed_h_check);
- //For Calculating min size
+ //For real min size of Live Edit Item
Evas_Coord vw, vh;
config_view_size_get(&vw, &vh);
- //Calculate relative_to values to fix its size
- //in case of width and height are fixed
- Evas_Coord min_w = ld->rel_to_info.min_w;
+ //Calculate real min size of Live Edit Item base on current relative
+ Evas_Coord min_w = (Evas_Coord) (((double) vw) *
+ (ld->rel_info.rel2_x - ld->rel_info.rel1_x));
+ Evas_Coord min_h = (Evas_Coord) (((double) vh) *
+ (ld->rel_info.rel2_y - ld->rel_info.rel1_y));
- if (!ld->rel_to_info.rel1_x_part && !ld->rel_to_info.rel2_x_part &&
- elm_check_state_get(ld->fixed_w_check))
+ //Set fixed properties of width for current Live Edit Item
+ if (fixed_w)
{
-float rel_x = (ld->rel_to_info.rel1_x +
- ld->rel_to_info.rel2_x) / 2;
-ld->rel_to_info.rel1_x = rel_x;
-ld->rel_to_info.rel2_x = rel_x;
-min_w = (Evas_Coord) (((double) vw) *
- (ld->rel_info.rel2_x - ld->rel_info.rel1_x));
+if (ld->rel_to_info.rel1_x_part)
+ {
+ ld->rel_to_info.align_x = 0.0;
+ ld->rel_to_info.rel2_x = ld->rel_to_info.rel1_x;
+ free(ld->rel_to_info.rel2_x_part);
+ ld->rel_to_info.rel2_x_part = strndup(ld->rel_to_info.rel1_x_part,
+ strlen(ld->rel_to_info.rel1_x_part));
+ }
+else if (ld->rel_to_info.rel2_x_part)
+ {
+ ld->rel_to_info.align_x = 1.0;
+ ld->rel_to_info.rel1_x = ld->rel_to_info.rel2_x;
+ free(ld->rel_to_info.rel1_x_part);
+ ld->rel_to_info.rel1_x_part = strndup(ld->rel_to_info.rel2_x_part,
+ strlen(ld->rel_to_info.rel2_x_part));
+ }
+ld->rel_to_info.min_w = min_w;
+ }
+ //Set fixed properties of height for current Live Edit Item
+ if (fixed_h)
+ {
+if (ld->rel_to_info.rel1_y_part)
+ {
+ ld->rel_to_info.align_y = 0.0;
+ ld->rel_to_info.rel2_y = ld->rel_to_info.rel1_y;
+ free(ld->rel_to_info.rel2_y_part);
+ ld->rel_to_info.rel2_y_part = strndup(ld->rel_to_info.rel1_y_part,
+ strlen(ld->rel_to_info.rel1_y_part));
+ }
+else if (ld->rel_to_info.rel2_y_part)
+ {
+
[EGIT] [tools/enventor] master 01/02: build_setting: add build setting tooltip messeges
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=29d91c48b36c7297e3022e64209c15b02afe99c3
commit 29d91c48b36c7297e3022e64209c15b02afe99c3
Author: Taehyub Kim
Date: Fri Jun 10 13:47:53 2016 +0900
build_setting: add build setting tooltip messeges
Summary: add build setting tooltip messeges
Test Plan:
1. launch enventor
2. go settign menu
3. click EDC build tab
4. move mouse cursor on each item
5. see the tooltip messeges
Reviewers: Hermet, Jaehyun_Cho, NikaWhite
Differential Revision: https://phab.enlightenment.org/D4034
---
data/themes/default/layout_setting.edc | 32 ++
src/bin/build_setting.c| 36 ++
2 files changed, 68 insertions(+)
diff --git a/data/themes/default/layout_setting.edc
b/data/themes/default/layout_setting.edc
index 32a3012..4ac82fc 100644
--- a/data/themes/default/layout_setting.edc
+++ b/data/themes/default/layout_setting.edc
@@ -318,6 +318,14 @@ group { "build_setting_layout";
rel2.to: "img_path_frame";
}
}
+ swallow { "img_path_tooltip";
+ repeat_events: 1;
+ desc {
+rel1.to: "img_path_frame";
+rel2.to: "img_path_frame";
+fixed: 1 1;
+ }
+ }
image { "snd_path_icon";
scale: 1;
desc {
@@ -361,6 +369,14 @@ group { "build_setting_layout";
rel2.to: "snd_path_frame";
}
}
+ swallow { "snd_path_tooltip";
+ repeat_events: 1;
+ desc {
+rel1.to: "snd_path_frame";
+rel2.to: "snd_path_frame";
+fixed: 1 1;
+ }
+ }
image { "fnt_path_icon";
scale: 1;
desc {
@@ -404,6 +420,14 @@ group { "build_setting_layout";
rel2.to: "fnt_path_frame";
}
}
+ swallow { "fnt_path_tooltip";
+ repeat_events: 1;
+ desc {
+rel1.to: "fnt_path_frame";
+rel2.to: "fnt_path_frame";
+fixed: 1 1;
+ }
+ }
image { "dat_path_icon";
scale: 1;
desc {
@@ -447,6 +471,14 @@ group { "build_setting_layout";
rel2.to: "dat_path_frame";
}
}
+ swallow { "data_path_tooltip";
+ repeat_events: 1;
+ desc {
+rel1.to: "dat_path_frame";
+rel2.to: "dat_path_frame";
+fixed: 1 1;
+ }
+ }
}
}
diff --git a/src/bin/build_setting.c b/src/bin/build_setting.c
index 7749537..edb4963 100644
--- a/src/bin/build_setting.c
+++ b/src/bin/build_setting.c
@@ -142,6 +142,15 @@ build_setting_content_get(build_setting_data *bsd,
Evas_Object *parent)
img_path_entry);
elm_layout_text_set(layout, "img_path_guide", _("Image Paths:"));
+ //Image Path Tooltip
+ Evas_Object *img_path_tooltip = elm_button_add(layout);
+ elm_object_style_set(img_path_tooltip, ENVENTOR_NAME);
+ elm_object_part_content_set(layout, "img_path_tooltip", img_path_tooltip);
+
+ elm_object_tooltip_text_set(img_path_tooltip,
+ _("Image path used for EDC editing."));
+ elm_object_focus_allow_set(img_path_tooltip, EINA_FALSE);
+
//Sound Path Entry
Evas_Object *snd_path_entry = entry_create(layout);
snd_path_entry_update(snd_path_entry,
@@ -150,6 +159,15 @@ build_setting_content_get(build_setting_data *bsd,
Evas_Object *parent)
snd_path_entry);
elm_layout_text_set(layout, "snd_path_guide", _("Sound Paths:"));
+ //Sound Path Tooltip
+ Evas_Object *snd_path_tooltip = elm_button_add(layout);
+ elm_object_style_set(snd_path_tooltip, ENVENTOR_NAME);
+ elm_object_part_content_set(layout, "snd_path_tooltip", snd_path_tooltip);
+
+ elm_object_tooltip_text_set(snd_path_tooltip,
+ _("Sound path used for EDC editing."));
+ elm_object_focus_allow_set(snd_path_tooltip, EINA_FALSE);
+
//Font Path Entry
Evas_Object *fnt_path_entry = entry_create(layout);
fnt_path_entry_update(fnt_path_entry,
@@ -158,6 +176,15 @@ build_setting_content_get(build_setting_data *bsd,
Evas_Object *parent)
fnt_path_entry);
elm_layout_text_set(layout, "fnt_path_guide", _("Font Paths:"));
+ //Font Path Tooltip
+ Evas_Object *font_path_tooltip = elm_button_add(layout);
+ elm_object_style_set(font_path_tooltip, ENVENTOR_NAME);
+ elm_object_part_content_set(layout, "fnt_path_tooltip", font_p
[EGIT] [tools/enventor] master 01/02: preference_setting: improve tooltips messages
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=dae6778bb8fee6ae8d3d174a0206444bc66954ca
commit dae6778bb8fee6ae8d3d174a0206444bc66954ca
Author: Taehyub Kim
Date: Fri Jun 10 11:11:58 2016 +0900
preference_setting: improve tooltips messages
Summary: add more comments for preference
Test Plan:
1. launch enventor
2. move mouse cursor on preference of setting
3. see the tooltip messeges
Reviewers: Hermet, Jaehyun_Cho, NikaWhite
Differential Revision: https://phab.enlightenment.org/D4033
---
src/bin/preference_setting.c | 27 ---
1 file changed, 20 insertions(+), 7 deletions(-)
diff --git a/src/bin/preference_setting.c b/src/bin/preference_setting.c
index 5cb479c..e5b92b2 100644
--- a/src/bin/preference_setting.c
+++ b/src/bin/preference_setting.c
@@ -30,7 +30,8 @@ label_create(Evas_Object *parent, const char *text)
}
static Evas_Object *
-toggle_create(Evas_Object *parent, const char *text, Eina_Bool state)
+toggle_create(Evas_Object *parent, const char *text, Eina_Bool state,
+ const char *tooltip_msg)
{
Evas_Object *toggle = elm_check_add(parent);
elm_object_style_set(toggle, "toggle");
@@ -38,6 +39,8 @@ toggle_create(Evas_Object *parent, const char *text,
Eina_Bool state)
evas_object_size_hint_weight_set(toggle, EVAS_HINT_EXPAND, 0);
evas_object_size_hint_align_set(toggle, EVAS_HINT_FILL, 0);
elm_object_text_set(toggle, text);
+ elm_object_tooltip_text_set(toggle, tooltip_msg);
+ elm_object_tooltip_orient_set(toggle, ELM_TOOLTIP_ORIENT_TOP_LEFT);
evas_object_show(toggle);
return toggle;
@@ -150,6 +153,9 @@ preference_setting_content_get(preference_setting_data *psd,
elm_box_pack_end(box, box2);
+ elm_object_tooltip_text_set(box2,
+ _("Set current live view size."));
+ elm_object_tooltip_orient_set(box2, ELM_TOOLTIP_ORIENT_TOP_LEFT);
//Label (View Size)
/* This layout is intended to put the label aligned to left side
@@ -217,32 +223,39 @@ preference_setting_content_get(preference_setting_data
*psd,
//Toggle (Tools)
Evas_Object *toggle_tools = toggle_create(box, _("Tools"),
- config_tools_get());
+ config_tools_get(),
+ _("Show and hide Toolbar."));
elm_box_pack_end(box, toggle_tools);
//Toggle (Console)
Evas_Object *toggle_console = toggle_create(box, _("Auto Hiding Console"),
- config_console_get());
+ config_console_get(),
+_("Show console box when it need to be shown."));
elm_box_pack_end(box, toggle_console);
//Toggle (Auto Indentation)
Evas_Object *toggle_indent = toggle_create(box, _("Auto Indentation"),
- config_auto_indent_get());
+ config_auto_indent_get(),
+ _("Apply auto indentation"
+"when inserting script."));
elm_box_pack_end(box, toggle_indent);
//Toggle (Auto Completion)
Evas_Object *toggle_autocomp = toggle_create(box, _("Auto Completion"),
-config_auto_complete_get());
+config_auto_complete_get(),
+ _("Enable and disable keyword auto completion."));
elm_box_pack_end(box, toggle_autocomp);
//Toggle (Smart Undo/Redo)
Evas_Object *toggle_smart_undo_redo = toggle_create(box, _("Smart
Undo/Redo"),
-config_smart_undo_redo_get());
+config_smart_undo_redo_get(),
+ _("Redo and Undo script by
word."));
elm_box_pack_end(box, toggle_smart_undo_redo);
//Toggle (Red Alert)
Evas_Object *toggle_red_alert = toggle_create(box, _("Error Message Red
Alert"),
- config_red_alert_get());
+ config_red_alert_get(),
+ _("When error is occured, show alert with red
lights."));
evas_object_size_hint_weight_set(toggle_red_alert, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(toggle_red_alert, EVAS_HINT_FILL, 0);
--
[EGIT] [tools/enventor] master 01/01: statusbar: improve tooltip messages
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=cc877931ca9196deb01858b331d4439dd4ecda3d
commit cc877931ca9196deb01858b331d4439dd4ecda3d
Author: Taehyub Kim
Date: Fri Jun 10 10:45:44 2016 +0900
statusbar: improve tooltip messages
Summary: add more comments for statusbar tooltip
Test Plan:
1. launch enventor
2. move mouse cursor on statusar tooltips
3. see the message of tooltips
Reviewers: Hermet, Jaehyun_Cho, NikaWhite
Differential Revision: https://phab.enlightenment.org/D4032
---
data/themes/default/layout_common.edc | 24
src/bin/statusbar.c | 33 ++---
2 files changed, 54 insertions(+), 3 deletions(-)
diff --git a/data/themes/default/layout_common.edc
b/data/themes/default/layout_common.edc
index 4a9f19f..3bbeb5d 100644
--- a/data/themes/default/layout_common.edc
+++ b/data/themes/default/layout_common.edc
@@ -2044,6 +2044,14 @@ group { name: "statusbar_layout";
image.normal: "cursor_arrow.png";
}
}
+ part { "elm.swallow.cursor_arrow.tooltip";
+ type: SWALLOW;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ rel1.to: "cursor_arrow";
+ rel2.to: "cursor_arrow";
+ }
+ }
part { name: "elm.text.cursor_pxx";
type: TEXT;
clip_to: "base_clip";
@@ -2235,6 +2243,14 @@ group { name: "statusbar_layout";
image.normal: "navi_group.png";
}
}
+ part { "elm.swallow.group_icon.tooltip";
+ type: SWALLOW;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ rel1.to: "group_icon";
+ rel2.to: "group_icon";
+ }
+ }
part { name: "elm.text.group_name";
type: TEXT;
clip_to: "base_clip";
@@ -2301,6 +2317,14 @@ group { name: "statusbar_layout";
}
}
}
+ part { "elm.swallow.line.tooltip";
+ type: SWALLOW;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ rel1.to: "elm.text.line_[";
+ rel2.to: "elm.text.line_[";
+ }
+ }
part { name: "elm.text.line_cur";
type: TEXT;
clip_to: "base_clip";
diff --git a/src/bin/statusbar.c b/src/bin/statusbar.c
index e464544..b0cee41 100644
--- a/src/bin/statusbar.c
+++ b/src/bin/statusbar.c
@@ -319,20 +319,47 @@ stats_init(Evas_Object *parent)
//View Scale button
create_statusbar_btn(layout, "expand", "scale_btn",
-"View Scale (Ctrl + Mouse Wheel)",
+_("View Scale (Ctrl + Mouse Wheel)"
+ "Set live view scale from 0.10 to 5.00"),
ELM_TOOLTIP_ORIENT_TOP_RIGHT,
view_scale_btn_cb, sd);
//View Resize Button
create_statusbar_btn(layout, "expand", "resize_btn",
-"Resize View Size",
+_("Resize View Size"
+ "Resize live View width and height."),
ELM_TOOLTIP_ORIENT_TOP,
view_resize_btn_cb, sd);
//View Invert Button
create_statusbar_btn(layout, "invert", "invert_btn",
-"Invert View Size",
+_("Invert View Size"
+ "Change aspect ratio between width and height."),
ELM_TOOLTIP_ORIENT_TOP,
view_invert_btn_cb, sd);
+ Evas_Object *arrow_tooltip = elm_button_add(layout);
+ elm_object_style_set(arrow_tooltip, ENVENTOR_NAME);
+ elm_object_part_content_set(layout, "elm.swallow.cursor_arrow.tooltip",
+ arrow_tooltip);
+ elm_object_tooltip_text_set(arrow_tooltip, _("Current mouse position in
live view."));
+ elm_object_tooltip_orient_set(arrow_tooltip, ELM_TOOLTIP_ORIENT_TOP);
+ elm_object_focus_allow_set(arrow_tooltip, EINA_FALSE);
+
+ Evas_Object *group_tooltip = elm_button_add(layout);
+ elm_object_style_set(group_tooltip, ENVENTOR_NAME);
+ elm_object_part_content_set(layout, "elm.swallow.group_icon.tooltip",
+ group_tooltip);
+ elm_object_tooltip_text_set(group_tooltip, _("Current group in live
view."));
+ elm_object_tooltip_orient_set(group_tooltip, ELM_TOOLTIP_ORIENT_TOP);
+ elm_object_focus_allow_set(group_tooltip, EINA_FALSE);
+
+ Evas_Object *line_tooltip = elm_button_add(layout
[EGIT] [tools/enventor] master 01/01: tools: improve browser tooltips
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=58fe5e78af92b89d4ef013d73c10f57cc7d63444
commit 58fe5e78af92b89d4ef013d73c10f57cc7d63444
Author: Taehyub Kim
Date: Fri Jun 10 10:22:21 2016 +0900
tools: improve browser tooltips
Summary: add more comment for broswer tooltips
Test Plan:
1. launch enventor
2. move mouse curor on broswer tooltips
3. see the message of tooltips
Reviewers: Hermet, Jaehyun_Cho, NikaWhite
Differential Revision: https://phab.enlightenment.org/D4031
---
src/bin/tools.c | 21 -
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/bin/tools.c b/src/bin/tools.c
index 02f80a3..86463d7 100644
--- a/src/bin/tools.c
+++ b/src/bin/tools.c
@@ -321,35 +321,46 @@ tools_init(Evas_Object *parent)
td->template_btn = btn;
btn = tools_btn_create(text_editor_ly, "console",
- _("Console Box (Alt + Down)"), console_cb);
+ _("Console Box (Alt + Down)"
+"Show Console box which displays build logs."),
+ console_cb);
evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_part_content_set(text_editor_ly, "elm.swallow.console", btn);
td->console_btn = btn;
btn = tools_btn_create(text_editor_ly, "file_browser",
- _("File Browser (F9)"), file_browser_cb);
+ _("File Browser (F9)"
+"Show File Browser wihch displays list of files."),
+ file_browser_cb);
evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_part_content_set(text_editor_ly, "elm.swallow.file_browser",
btn);
td->file_browser_btn = btn;
btn = tools_btn_create(text_editor_ly, "edc_navigator",
- _("EDC Navigator (F10)"), edc_navigator_cb);
+ _("EDC Navigator (F10)"
+"Show EDC Navigator which displays current
parts"
+"hierarchically."),
+ edc_navigator_cb);
evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_part_content_set(text_editor_ly, "elm.swallow.edc_navigator",
btn);
td->edc_navigator_btn = btn;
- btn = tools_btn_create(text_editor_ly, "status", _("Status (F11)"),
+ btn = tools_btn_create(text_editor_ly, "status",
+ _("Status (F11)"
+"Show Status bar which displays live view
informations."),
status_cb);
evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_part_content_set(text_editor_ly, "elm.swallow.status", btn);
td->status_btn = btn;
- btn = tools_btn_create(text_editor_ly, "menu", _("Enventor Menu (Esc)"),
+ btn = tools_btn_create(text_editor_ly, "menu",
+ _("Enventor Menu (Esc)"
+ "Show Menu for setting enventor."),
menu_cb);
elm_object_tooltip_orient_set(btn, ELM_TOOLTIP_ORIENT_BOTTOM_LEFT);
evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
--
[EGIT] [tools/enventor] master 01/01: tools: improve tooltips messages of script
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=75c20f5ca1d18c2a1a537ed712c3f7467ec48e9f
commit 75c20f5ca1d18c2a1a537ed712c3f7467ec48e9f
Author: Taehyub Kim
Date: Fri Jun 10 09:51:32 2016 +0900
tools: improve tooltips messages of script
Summary: add more comment of script tooltips
Test Plan:
1. launch enventor
2. move mouse cursor on script tooltip
3. see the message of tooltips
Reviewers: Hermet, Jaehyun_Cho, NikaWhite
Reviewed By: NikaWhite
Differential Revision: https://phab.enlightenment.org/D4030
---
src/bin/tools.c | 29 ++---
1 file changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/bin/tools.c b/src/bin/tools.c
index fccf2e7..cf84405 100644
--- a/src/bin/tools.c
+++ b/src/bin/tools.c
@@ -258,39 +258,51 @@ tools_init(Evas_Object *parent)
evas_object_size_hint_align_set(text_editor_ly, EVAS_HINT_FILL,
EVAS_HINT_FILL);
- btn = tools_btn_create(text_editor_ly, "save",_("Save File (Ctrl + S)"),
+ btn = tools_btn_create(text_editor_ly, "save",
+ _("Save File (Ctrl + S)"
+"Save current script to build."),
save_cb);
evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_part_content_set(text_editor_ly, "elm.swallow.save", btn);
- btn = tools_btn_create(text_editor_ly, "undo", _("Undo Text (Ctrl + Z)"),
+ btn = tools_btn_create(text_editor_ly, "undo",
+ _("Undo Text (Ctrl + Z)"
+"Back to previous script step by step."),
undo_cb);
evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_part_content_set(text_editor_ly, "elm.swallow.undo", btn);
- btn = tools_btn_create(text_editor_ly, "redo", _("Redo Text (Ctrl + R)"),
+ btn = tools_btn_create(text_editor_ly, "redo",
+ _("Redo Text (Ctrl + R)"
+"Go to latest script step by step."),
redo_cb);
evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_part_content_set(text_editor_ly, "elm.swallow.redo", btn);
- btn = tools_btn_create(text_editor_ly, "find", _("Find/Replace (Ctrl + F)"),
+ btn = tools_btn_create(text_editor_ly, "find",
+ _("Find/Replace (Ctrl + F)"
+"Show Find/Replace window to find and replace
input text."),
find_cb);
evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_part_content_set(text_editor_ly, "elm.swallow.find", btn);
td->find_btn = btn;
- btn = tools_btn_create(text_editor_ly, "goto", _("Goto Lines (Ctrl + L)"),
+ btn = tools_btn_create(text_editor_ly, "goto",
+ _("Goto Lines (Ctrl + L)"
+"Show Goto Window to move current line."),
goto_cb);
evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_part_content_set(text_editor_ly, "elm.swallow.goto", btn);
td->goto_btn = btn;
- btn = tools_btn_create(text_editor_ly, "lines", _("Line Numbers (F5)"),
+ btn = tools_btn_create(text_editor_ly, "lines",
+ _("Line Numbers (F5)"
+"Show and hide line number of script."),
lines_cb);
evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -298,7 +310,10 @@ tools_init(Evas_Object *parent)
td->lines_btn = btn;
btn = tools_btn_create(text_editor_ly, "template",
- _("Insert Template (Ctrl + T)"), template_cb);
+ _("Insert Template (Ctrl + T)"
+"Insert template code automatically,"
+"It is appropriate to current context."),
+ template_cb);
evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_part_content_set(text_editor_ly, "elm.swallow.template", btn);
--
[EGIT] [core/efl] master 01/01: elm ctxpopup: fix auto_hide mode to work correctly
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a428e1e7125f28e41532c659b9e31a8ff0bb5d11
commit a428e1e7125f28e41532c659b9e31a8ff0bb5d11
Author: Taehyub Kim
Date: Tue Jun 7 17:19:15 2016 +0900
elm ctxpopup: fix auto_hide mode to work correctly
@fix
Summary: fixx auto_hide mode to work correctly
Test Plan:
1. launch elementary_test - ctxpopup
2. click normal ctxpopup and auto_hide ctxpopup sample
3. check the auto_hide function whether it is work well or not
Reviewers: Jaehyun_Cho, raster, jpeg, cedric, singh.amitesh, DaveMDS, Hermet
Reviewed By: DaveMDS
Differential Revision: https://phab.enlightenment.org/D3967
---
src/bin/elementary/test_ctxpopup.c | 1 +
src/lib/elementary/elc_ctxpopup.c | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/bin/elementary/test_ctxpopup.c
b/src/bin/elementary/test_ctxpopup.c
index 27e5376..fbc9042 100644
--- a/src/bin/elementary/test_ctxpopup.c
+++ b/src/bin/elementary/test_ctxpopup.c
@@ -50,6 +50,7 @@ _ctxpopup_item_cb(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *ev
{
printf("ctxpopup item selected: %s\n",
elm_object_item_text_get(event_info));
+ elm_ctxpopup_dismiss(obj);
}
static Elm_Object_Item *
diff --git a/src/lib/elementary/elc_ctxpopup.c
b/src/lib/elementary/elc_ctxpopup.c
index 3ef52c5..2cfc15c 100644
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -938,7 +938,8 @@ _bg_clicked_cb(void *data,
{
ELM_CTXPOPUP_DATA_GET(data, sd);
- _hide_signals_emit(data, sd->dir);
+ if (sd->auto_hide)
+ _hide_signals_emit(data, sd->dir);
}
static void
--
[EGIT] [tools/enventor] master 01/01: live_edit: make live edit item fixed when width and height are fixed
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=e30aca010e38df52df5d70dc954257f83c30bf94
commit e30aca010e38df52df5d70dc954257f83c30bf94
Author: Taehyub Kim
Date: Sat May 28 19:38:59 2016 +0900
live_edit: make live edit item fixed when width and height are fixed
Summary:
live_edit: when the live edit item's width and height are fixed,
the size of live edit item should be fixed.
Test Plan:
1. launch enventor
2. click a live edit item
3. check all of fixed options
4. do not set relative_to options
5. insert the live edit item to the live view
6. check the inserted item's size whether it is fixed or not
Reviewers: Hermet, Jaehyun_Cho, NikaWhite
Differential Revision: https://phab.enlightenment.org/D3976
---
src/bin/live_edit.c | 20
1 file changed, 20 insertions(+)
diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index de4ebb4..38919c1 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -355,6 +355,26 @@ live_edit_insert(live_data *ld)
if (!ld->rel_to_info.rel2_y_to)
ld->rel_to_info.rel2_to_y = ld->rel_info.rel2_y;
+
+ //Calculate relative_to values to fix its size
+ //in case of width and height are fixed
+ Eina_Bool fixed_w = elm_check_state_get(ld->fixed_w_check);
+ Eina_Bool fixed_h = elm_check_state_get(ld->fixed_h_check);
+
+ if (!ld->rel_to_info.rel1_x_to && !ld->rel_to_info.rel1_y_to &&
+ !ld->rel_to_info.rel2_x_to && !ld->rel_to_info.rel2_y_to &&
+ fixed_w && fixed_h)
+ {
+float rel_x = (ld->rel_to_info.rel1_to_x +
+ ld->rel_to_info.rel2_to_x) / 2;
+float rel_y = (ld->rel_to_info.rel1_to_y +
+ ld->rel_to_info.rel2_to_y) / 2;
+ld->rel_to_info.rel1_to_x = rel_x;
+ld->rel_to_info.rel1_to_y = rel_y;
+ld->rel_to_info.rel2_to_x = rel_x;
+ld->rel_to_info.rel2_to_y = rel_y;
+ }
+
//Calculate min size
Evas_Coord vw, vh;
config_view_size_get(&vw, &vh);
--
[EGIT] [tools/enventor] master 01/01: live_edit: add toggle key for enabling and disabling auto align
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=0e7fd598743c1c5aa6bda8dc25e5c0f59325712e
commit 0e7fd598743c1c5aa6bda8dc25e5c0f59325712e
Author: Taehyub Kim
Date: Sat May 28 19:33:56 2016 +0900
live_edit: add toggle key for enabling and disabling auto align
Summary: add control toggle key for enabling and disabling auto align
Test Plan:
1. launch enventor
2. click a live edit item using toolbar item
3. move the item to the another part
4. press control key when the item is close to the another part
5. check auto align function whether it is disabled or not
Reviewers: Jaehyun_Cho, NikaWhite, Hermet
Differential Revision: https://phab.enlightenment.org/D3931
---
src/bin/live_edit.c | 44 +++-
1 file changed, 43 insertions(+), 1 deletion(-)
diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index ff87246..98f7c82 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -97,6 +97,7 @@ typedef struct live_editor_s
Eina_Bool align_top : 1;
Eina_Bool align_bottom : 1;
+ Eina_Bool ctrl_pressed : 1;
} live_data;
typedef struct auto_align_data_s
@@ -400,6 +401,9 @@ keygrabber_key_down_cb(void *data, Evas *e EINA_UNUSED,
live_data *ld = data;
Evas_Event_Key_Down *ev = event_info;
+ if (!strcmp(ev->key, "Control_L"))
+ ld->ctrl_pressed = EINA_TRUE;
+
if (!strcmp(ev->key, "Return")) live_edit_insert(ld);
else if (strcmp(ev->key, "Delete") &&
strcmp(ev->key, "BackSpace")) return;
@@ -407,12 +411,32 @@ keygrabber_key_down_cb(void *data, Evas *e EINA_UNUSED,
live_edit_cancel();
}
+static void
+keygrabber_key_up_cb(void *data, Evas *e EINA_UNUSED,
+ Evas_Object *obj EINA_UNUSED, void *event_info)
+{
+ live_data *ld = data;
+ Evas_Event_Key_Up *ev = event_info;
+
+ if (!strcmp(ev->key, "Control_L"))
+ ld->ctrl_pressed = EINA_FALSE;
+}
+
Evas_Coord_Point
calc_ctrl_pt_auto_align_pos(live_data *ld, int cursor_x, int cursor_y,
int align_in, int *align_out)
{
int res_x, res_y;
unsigned int nx, ny;
+ Evas_Coord_Point pt;
+
+ // if control key is pressed, auto align is not applied
+ if (ld->ctrl_pressed)
+ {
+pt.x = cursor_x;
+pt.y = cursor_y;
+return pt;
+ }
res_x = res_y = -1;
nx = ny = LIVE_EDIT_MAX_DIST;
unsigned int dist = LIVE_EDIT_AUTO_ALIGN_DIST;
@@ -459,7 +483,6 @@ calc_ctrl_pt_auto_align_pos(live_data *ld, int cursor_x,
int cursor_y,
}
}
- Evas_Coord_Point pt;
if (res_x != -1)
{
@@ -1642,6 +1665,14 @@ calc_layout_auto_align_pos(Evas_Object *layout,
live_data *ld, int x, int y,
static int pre_layout_dir_x = 0;
static int pre_layout_dir_y = 0;
+ // if control key is pressed, auto align is not applied
+ if (ld->ctrl_pressed)
+ {
+*ret_x = x;
+*ret_y = y;
+return;
+ }
+
Eina_Bool is_up, is_down, is_left, is_right;
is_up = is_down = is_left = is_right = EINA_FALSE;
@@ -2005,12 +2036,23 @@ live_edit_layer_set(live_data *ld)
evas_object_rectangle_add(evas_object_evas_get(ld->live_view));
evas_object_event_callback_add(ld->keygrabber, EVAS_CALLBACK_KEY_DOWN,
keygrabber_key_down_cb, ld);
+ evas_object_event_callback_add(ld->keygrabber, EVAS_CALLBACK_KEY_UP,
+ keygrabber_key_up_cb, ld);
evas_object_event_callback_add(ld->keygrabber, EVAS_CALLBACK_KEY_DOWN,
keygrabber_direction_key_down_cb, ld);
evas_object_event_callback_add(ld->live_view, EVAS_CALLBACK_RESIZE,
live_view_geom_cb, ld);
evas_object_event_callback_add(ld->live_view, EVAS_CALLBACK_MOVE,
live_view_geom_cb, ld);
+
+ // Add keygrab for Control_L, To receive key_up_callback we need to use mask
+ Evas_Modifier_Mask mask = evas_key_modifier_mask_get(
+ evas_object_evas_get(ld->keygrabber), "Control");
+ if (!evas_object_key_grab(ld->keygrabber, "Control_L", mask, 0, EINA_FALSE))
+ EINA_LOG_ERR(_("Failed to grab key - %s"), "Control_L");
+ if (!evas_object_key_grab(ld->keygrabber, "Control_L", 0, 0, EINA_FALSE))
+ EINA_LOG_ERR(_("Failed to grab key - %s"), "Control_L");
+
key_grab_add(ld->keygrabber, "Return");
key_grab_add(ld->keygrabber, "Delete");
key_grab_add(ld->keygrabber, "BackSpace");
--
[EGIT] [tools/enventor] master 01/01: live_edit: add fixed width and height interface in live edit view
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=6fb471d8d493cd0c579643cd09229da0ef78dc83
commit 6fb471d8d493cd0c579643cd09229da0ef78dc83
Author: Taehyub Kim
Date: Mon May 23 21:25:30 2016 +0900
live_edit: add fixed width and height interface in live edit view
Summary: update fixed width and height interface to choose easier
Test Plan:
1. launch enventor
2. make live edit item by clicking live edit toolbar
3. click fixed width or fixed height check item on setting interface in
live edit view
4. set relative_to property by dragging the edge of the part
5. insert the live edit item
6. check the result in text view
Reviewers: Jaehyun_Cho, NikaWhite, Hermet
Differential Revision: https://phab.enlightenment.org/D3962
---
data/themes/default/layout_common.edc | 30 ++
src/bin/base_gui.c| 4 +-
src/bin/live_edit.c | 104 +-
src/bin/main.c| 6 +-
src/bin/panes.c | 26 +
src/include/base_gui.h| 2 +-
src/include/live_edit.h | 1 +
src/include/panes.h | 2 +
8 files changed, 120 insertions(+), 55 deletions(-)
diff --git a/data/themes/default/layout_common.edc
b/data/themes/default/layout_common.edc
index 1d46f7f..b3c714c 100644
--- a/data/themes/default/layout_common.edc
+++ b/data/themes/default/layout_common.edc
@@ -2730,6 +2730,24 @@ group { "tools_layout";
relative: 0.0 1.0;
to_y: "elm.swallow.tools";
}
+rel2.to_y: "elm.swallow.fixed_bar";
+rel2.relative: 1.0 0.0;
+ }
+ }
+ swallow { "elm.swallow.fixed_bar";
+ desc { "default";
+min: 0 35;
+align: 0.5 0.0;
+fixed: 1 1;
+rel1.relative: 0.0 1.0;
+rel2.relative: 1.0 1.0;
+ }
+ desc { "visible";
+inherit: "default";
+align: 0.5 1.0;
+fixed: 1 1;
+rel1.relative: 0.0 1.0;
+rel2.relative: 1.0 1.0;
}
}
}
@@ -2746,6 +2764,18 @@ group { "tools_layout";
target: "tools_base";
transition: DECELERATE 0.25;
}
+ program { name: "fixed_bar_show";
+ signal: "elm,state,fixed_bar,show";
+ action: STATE_SET "visible" 0.0;
+ target: "elm.swallow.fixed_bar";
+ transition: DECELERATE 0.25 CURRENT;
+ }
+ program { name: "fixed_bar_hide";
+ signal: "elm,state,fixed_bar,hide";
+ action: STATE_SET "default" 0.0;
+ target: "elm.swallow.fixed_bar";
+ transition: DECELERATE 0.25 CURRENT;
+ }
}
}
diff --git a/src/bin/base_gui.c b/src/bin/base_gui.c
index 9f15e7e..780d053 100644
--- a/src/bin/base_gui.c
+++ b/src/bin/base_gui.c
@@ -157,10 +157,12 @@ base_win_resize_object_add(Evas_Object *resize_obj)
}
void base_tools_set(Evas_Object *live_view_tools,
-Evas_Object *text_editor_tools)
+Evas_Object *text_editor_tools,
+Evas_Object *live_view_fixed_bar)
{
panes_live_view_tools_set(live_view_tools);
panes_text_editor_tools_set(text_editor_tools);
+ panes_live_view_fixed_bar_set(live_view_fixed_bar);
file_browser_tools_set();
edc_navigator_tools_set();
diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index 60f911d..c490de1 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -1971,11 +1971,24 @@ key_grab_add(Evas_Object *keygrabber, const char *key)
}
static void
+rel_to_values_reset(live_data *ld)
+{
+ //Reset state about relative_to
+ ld->rel_to_info.align_x = 0.5;
+ ld->rel_to_info.align_y = 0.5;
+ ld->rel_to_info.rel1_x_to = NULL;
+ ld->rel_to_info.rel1_y_to = NULL;
+ ld->rel_to_info.rel2_x_to = NULL;
+ ld->rel_to_info.rel2_y_to = NULL;
+}
+
+static void
fixed_w_check_changed_cb(void *data, Evas_Object *obj,
void *event_info EINA_UNUSED)
{
live_data *ld = data;
ld->fixed_w = elm_check_state_get(obj);
+ rel_to_values_reset(ld);
}
static void
@@ -1983,56 +1996,7 @@ fixed_h_check_changed_cb(void *data, Evas_Object *obj,
void *event_info EINA_UNU
{
live_data *ld = data;
ld->fixed_h = elm_check_state_get(obj);
-}
-
-static void
-show_fixed_check_list(live_data *ld)
-{
- if (ld->fixed_ctxpopup)
- return;
-
- ld->fixed_ctxpopup = elm_ctxpopup_add(ld->live_view);
- //FIXME: because the focus highlighting is floated after ctxpopup is
- //dismissed, i disable the focus here
- elm_object_tree_focus_allow_set(ld->fixed_ctxpopup, EINA_FALSE);
- evas
[EGIT] [tools/enventor] master 01/01: live_edit: fix the live edit item moving issue
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=f0f7e2dfffabb29c15c98fad6c29f558f9cecd8e
commit f0f7e2dfffabb29c15c98fad6c29f558f9cecd8e
Author: Taehyub Kim
Date: Mon May 23 13:49:41 2016 +0900
live_edit: fix the live edit item moving issue
Summary:
if we move a live edit item by direction key, sometimes pixel is increased
by 2 pixels.
so I modified it is increaed by 1 pixed when the scale is larger than 1.0
Test Plan:
1. launch enventor
2. click a live edit item using toolbar
3. move the live edit item by direction key
4. check the change of pixel info
@T3473
Reviewers: Jaehyun_Cho, NikaWhite, Hermet
Differential Revision: https://phab.enlightenment.org/D3946
---
src/bin/live_edit.c | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index 3ea5224..48d2a66 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -247,40 +247,40 @@ info_text_update(live_data *ld)
Evas_Coord lx, ly, lw, lh;
evas_object_geometry_get(ld->live_view, &lx, &ly, &lw, &lh);
+ Evas_Coord vw, vh;
+ config_view_size_get(&vw, &vh);
+
Enventor_Object *enventor = base_enventor_get();
//reverse coordinates if mirror mode is enabled.
double ox = ld->rel_info.rel1_x;
double ox2 = ld->rel_info.rel2_x;
- double ow = (ld->rel_info.rel1_x * (double) lw);
- double ow2 = (ld->rel_info.rel2_x * (double) lw);
+ double ow = (ld->rel_info.rel1_x * (double) vw);
+ double ow2 = (ld->rel_info.rel2_x * (double) vw);
if (enventor_object_mirror_mode_get(enventor))
{
ox = 1 - ox;
ox2 = 1 - ox2;
-ow = lw - ow;
-ow2 = lw - ow2;
+ow = vw - ow;
+ow2 = vw - ow2;
}
//Rel1
snprintf(buf, sizeof(buf), "%.2f %.2f (%d, %d)",
ox, ld->rel_info.rel1_y,
(int) round(ow),
-(int) round(ld->rel_info.rel1_y * (double) lh));
+(int) round(ld->rel_info.rel1_y * (double) vh));
evas_object_text_text_set(ld->info_text[Info_Text_Rel1], buf);
//Rel2
snprintf(buf, sizeof(buf), "%.2f %.2f (%d, %d)",
ox2, ld->rel_info.rel2_y,
(int) round(ow2),
-(int) round(ld->rel_info.rel2_y * (double) lh));
+(int) round(ld->rel_info.rel2_y * (double) vh));
evas_object_text_text_set(ld->info_text[Info_Text_Rel2], buf);
//Size
- Evas_Coord vw, vh;
- config_view_size_get(&vw, &vh);
-
vw = (Evas_Coord) (((double) vw) *
(ld->rel_info.rel2_x - ld->rel_info.rel1_x));
vh = (Evas_Coord) (((double) vh) *
--
[EGIT] [tools/enventor] master 01/01: live_edit: remove unnecessary code
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=4dce517e174914b2bac845ca57a73ec2bfe3647d
commit 4dce517e174914b2bac845ca57a73ec2bfe3647d
Author: Taehyub Kim
Date: Sun May 22 20:26:39 2016 +0900
live_edit: remove unnecessary code
Summary:
toolbox object is not used anyware, so I remove it
@fix
Reviewers: Hermet, Jaehyun_Cho, NikaWhite
Differential Revision: https://phab.enlightenment.org/D3964
---
src/bin/live_edit.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index 0c6a96f..5c07cb9 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -51,7 +51,6 @@ typedef enum
typedef struct live_editor_s
{
- Evas_Object *toolbox;
Evas_Object *layout;
Evas_Object *live_view;
Evas_Object *ctrl_pt[Ctrl_Pt_Cnt];
@@ -2276,7 +2275,6 @@ void
live_edit_term(void)
{
live_data *ld = g_ld;
- evas_object_del(ld->toolbox);
live_edit_cancel();
free_auto_align_data(ld->auto_align_array);
--
[EGIT] [core/efl] master 01/01: elc_popup: add escape key binding
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=55a6bd7fbb8765aff0c0ce0053de903e4d31baea
commit 55a6bd7fbb8765aff0c0ce0053de903e4d31baea
Author: Taehyub Kim
Date: Wed May 18 21:55:35 2016 +0900
elc_popup: add escape key binding
Summary:
There are no methods to close the popup with key down.
So I added the escape key binding to close the popup with escape key.
Test Plan:
1. patch this code
2. delete /home/{user}/.elementary to refresh the config value
3. launch elementary_test -to "popup"
4. click one example of the list and press escape key
5. see closing the popup
Reviewers: cedric, raster, jpeg, Jaehyun_Cho, Hermet
Reviewed By: Hermet
Differential Revision: https://phab.enlightenment.org/D3876
Conflicts:
src/lib/elementary/elm_priv.h
---
config/default/base.src.in | 8 +++-
config/mobile/base.src.in | 8 +++-
config/standard/base.src.in| 8 +++-
src/lib/elementary/elc_popup.c | 11 +++
src/lib/elementary/elm_priv.h | 2 +-
5 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/config/default/base.src.in b/config/default/base.src.in
index bd2ec06..eed391c 100644
--- a/config/default/base.src.in
+++ b/config/default/base.src.in
@@ -1,5 +1,5 @@
group "Elm_Config" struct {
- value "config_version" int: 131079;
+ value "config_version" int: 131083;
value "engine" string: "";
value "vsync" uchar: 0;
value "thumbscroll_enable" uchar: 1;
@@ -597,6 +597,12 @@ group "Elm_Config" struct {
value "action" string: "move";
value "params" string: "down";
}
+ group "Elm_Config_Binding_Key" struct {
+ value "context" int: 0;
+ value "key" string: "Escape";
+ value "action" string: "esc";
+ value "params" string: "";
+ }
}
}
group "Elm_Config_Bindings_Widget" struct {
diff --git a/config/mobile/base.src.in b/config/mobile/base.src.in
index d753de5..2622b89 100644
--- a/config/mobile/base.src.in
+++ b/config/mobile/base.src.in
@@ -1,5 +1,5 @@
group "Elm_Config" struct {
- value "config_version" int: 131079;
+ value "config_version" int: 131083;
value "engine" string: "";
value "vsync" uchar: 0;
value "thumbscroll_enable" uchar: 1;
@@ -601,6 +601,12 @@ group "Elm_Config" struct {
value "action" string: "move";
value "params" string: "down";
}
+ group "Elm_Config_Binding_Key" struct {
+ value "context" int: 0;
+ value "key" string: "Escape";
+ value "action" string: "escape";
+ value "params" string: "";
+ }
}
}
group "Elm_Config_Bindings_Widget" struct {
diff --git a/config/standard/base.src.in b/config/standard/base.src.in
index cf0d773..e8ca1d0 100644
--- a/config/standard/base.src.in
+++ b/config/standard/base.src.in
@@ -1,5 +1,5 @@
group "Elm_Config" struct {
- value "config_version" int: 131079;
+ value "config_version" int: 131083;
value "engine" string: "";
value "vsync" uchar: 0;
value "thumbscroll_enable" uchar: 0;
@@ -598,6 +598,12 @@ group "Elm_Config" struct {
value "action" string: "move";
value "params" string: "down";
}
+ group "Elm_Config_Binding_Key" struct {
+ value "context" int: 0;
+ value "key" string: "Escape";
+ value "action" string: "escape";
+ value "params" string: "esc";
+ }
}
}
group "Elm_Config_Bindings_Widget" struct {
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index db93b01..c5c57e5 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -44,6 +44,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
};
static Eina_Bool _key_action_move(Evas_Object *obj, const char *params);
+static Eina_Bool _key_action_escape(Evas_Object *obj, const char *params);
static void _parent_geom_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
void *event_info EINA_UNUSED);
static Eina_Bool
_block_clicked_cb(void *data, const Eo_Event *event);
@@ -55,6 +56,7 @@ _hide_effect
[EGIT] [tools/enventor] master 01/01: statusbar: update live edit item when view is resized
jaehyun pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=7b770ab594b49c2745c971de27f656c35fd8eb70 commit 7b770ab594b49c2745c971de27f656c35fd8eb70 Author: Taehyub Kim Date: Wed May 18 00:24:53 2016 +0900 statusbar: update live edit item when view is resized Summary: update live edit item when view is resized Test Plan: 1. add a live edit item on live view 2. resize the live view using resize item on statusbar 3. see live edit item is resing well Reviewers: Hermet, NikaWhite, Jaehyun_Cho Reviewed By: Jaehyun_Cho Differential Revision: https://phab.enlightenment.org/D3940 --- src/bin/statusbar.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/bin/statusbar.c b/src/bin/statusbar.c index 0779c03..e464544 100644 --- a/src/bin/statusbar.c +++ b/src/bin/statusbar.c @@ -133,6 +133,9 @@ view_resize_slider_changed_cb(void *data, Evas_Object *obj EINA_UNUSED, config_view_size_set(w, val); enventor_object_live_view_size_set(base_enventor_get(), w, val); } + + //Just in live edit mode case. + live_edit_update(); } static Evas_Object * --
[EGIT] [tools/enventor] master 01/01: layout_common: fix the colorselector scalable
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=9ec8d25c7bdebcf8ee643fff46da5614a36bc283
commit 9ec8d25c7bdebcf8ee643fff46da5614a36bc283
Author: Taehyub Kim
Date: Tue May 17 17:22:08 2016 +0900
layout_common: fix the colorselector scalable
Summary: make the colorselector scalable when the base scale of enventor is
changed
Test Plan:
1. Launch Enventor
2. Change the scale
3. Show colorselector by clicking the color keyword
4. Check the colorselector
Reviewers: Hermet, Jaehyun_Cho, NikaWhite
Differential Revision: https://phab.enlightenment.org/D3949
---
data/themes/default/layout_common.edc | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/data/themes/default/layout_common.edc
b/data/themes/default/layout_common.edc
index 0fb0e35..b8ff972 100644
--- a/data/themes/default/layout_common.edc
+++ b/data/themes/default/layout_common.edc
@@ -1739,7 +1739,6 @@ group { name: "colorselector_layout";
spacer { "base";
scale: 1;
desc {
-min: 251 170;
}
}
swallow { "elm.swallow.colorselector";
@@ -1749,7 +1748,7 @@ group { name: "colorselector_layout";
rel1.to: "base";
rel2.to: "base";
align: 0.0 0.0;
-min: 160 0;
+min: 160 130;
max: 160 130;
}
}
@@ -1972,7 +1971,7 @@ group { name: "colorselector_layout";
align: 0.0 0.0;
min: 0 25;
max: -1 25;
-rel1.to_y: "colors_padding";
+rel1.to_y: "elm.swallow.input_alpha";
rel1.relative: 0.0 1.0;
color: 128 0 0 128;
}
--
[EGIT] [tools/enventor] master 01/01: template: fix the fixed condition for relative_to
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=6ba3339d252eb3e06f95d032608cd0401f19c194
commit 6ba3339d252eb3e06f95d032608cd0401f19c194
Author: Taehyub Kim
Date: Mon May 16 23:30:25 2016 +0900
template: fix the fixed condition for relative_to
Summary:
fix the fixed condifion for relative_to.
the condition was wrong, so I fixed it.
Test Plan:
1. Launch Enventor
2. Click a Live Edit Item
3. Check fixed_w and fixed_h
4. Insert the Live Edit Item
Reviewers: Hermet, Jaehyun_Cho, NikaWhite
Differential Revision: https://phab.enlightenment.org/D3943
---
src/lib/template.c | 17 +++--
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/lib/template.c b/src/lib/template.c
index d4af185..055fa92 100644
--- a/src/lib/template.c
+++ b/src/lib/template.c
@@ -321,16 +321,13 @@ template_part_insert(edit_data *ed, Edje_Part_Type
part_type,
//Width and Height are fixed
else if(fixed_w && fixed_h)
{
-if (!rel1_x_to || !rel1_y_to || !rel2_x_to || !rel2_y_to)
- {
- elm_entry_entry_insert(edit_entry, p);
- snprintf(buf, sizeof(buf), " fixed: %d %d;", 1, 1);
- elm_entry_entry_insert(edit_entry, buf);
- elm_entry_entry_insert(edit_entry, p);
- snprintf(buf, sizeof(buf), " min: %d %d;", min_w,
min_h);
- elm_entry_entry_insert(edit_entry, buf);
- line_cnt += 2;
- }
+elm_entry_entry_insert(edit_entry, p);
+snprintf(buf, sizeof(buf), " fixed: %d %d;", 1, 1);
+elm_entry_entry_insert(edit_entry, buf);
+elm_entry_entry_insert(edit_entry, p);
+snprintf(buf, sizeof(buf), " min: %d %d;", min_w, min_h);
+elm_entry_entry_insert(edit_entry, buf);
+line_cnt += 2;
}
//If there are some relative_to part then insert relative_to
--
[EGIT] [tools/enventor] master 01/01: enventor_smart: fix mirror mode for relative_to
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=afd04c7469b52c17d4ce393f61b6ec538966ed15 commit afd04c7469b52c17d4ce393f61b6ec538966ed15 Author: Taehyub Kim Date: Mon May 16 23:28:30 2016 +0900 enventor_smart: fix mirror mode for relative_to Summary: When we apply mirror mode, we need to considering swap relative_to, but exist code was not checking null pointer. so I fixed the logic. Test Plan: 1. Launch Enventor 2. Apply Mirror Mode 3. Insert a live edit item with relative_set setting Reviewers: Hermet, Jaehyun_Cho, NikaWhite Differential Revision: https://phab.enlightenment.org/D3942 --- src/lib/enventor_smart.c | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c index f659519..2cae2eb 100644 --- a/src/lib/enventor_smart.c +++ b/src/lib/enventor_smart.c @@ -843,12 +843,11 @@ _enventor_object_template_part_insert(Eo *obj EINA_UNUSED, align_x = 1.0; else if (align_x == 1.0) align_x = 0.0; - - char buf[1024]; - strcpy(buf, rel1_x_to); - strcpy(rel1_x_to, rel2_x_to); - strcpy(rel2_x_to, buf); + char *buf; + buf = rel1_x_to; + rel1_x_to = rel2_x_to; + rel2_x_to = buf; } return template_part_insert(pd->main_it.ed, part, insert_type, --
