[EGIT] [website/www-content] master 01/01: Wiki page syntax changed with summary [fix wiki syntax page to explain everything without needing to edit src] by Raster
WWW-www.enlightenment.org pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=3a9dd41c9e9219ecfaaf317354d66688a3818a95
commit 3a9dd41c9e9219ecfaaf317354d66688a3818a95
Author: Raster ras...@rasterman.com
Date: Mon May 18 23:25:03 2015 -0700
Wiki page syntax changed with summary [fix wiki syntax page to explain
everything without needing to edit src] by Raster
---
pages/wiki/syntax.txt | 327 ++
1 file changed, 305 insertions(+), 22 deletions(-)
diff --git a/pages/wiki/syntax.txt b/pages/wiki/syntax.txt
index 0aa5833..bdd4e2a 100644
--- a/pages/wiki/syntax.txt
+++ b/pages/wiki/syntax.txt
@@ -1,4 +1,5 @@
~~Title: Wiki Syntax~~
+~~CODE-c~~
A title like the title of this page:
@@ -117,21 +118,91 @@ An external link like: [[http://example.com|External
Link]] would go here. An in
+A left-aligned image with text flowing around it
+
+{{ :efl-core.png?nolink|Left}}
+
+code
+{{ :efl-core.png?nolink|Left}}
+/code
+
+
+
+A right-aligned image with text flowing around it
+
+{{:efl-core.png?nolink |Right}}
+
+code
+{{:efl-core.png?nolink |Right}}
+/code
+
+
+
+A centered image on its own on a line:
+{{ :efl-core.png?nolink }}
+code
+{{ :efl-core.png?nolink }}
+/code
+
+A centered image on its own on a line with a mouse-over label
+{{ :efl-core.png?nolink |Label here}}
+code
+{{ :efl-core.png?nolink |Label here}}
+/code
+
+An inlined image put into the content along with any text around
+{{:efl-core.png?nolink24|Inlined image with content}}
+it so it looks like it's part of the text and has just been slotted in as well
as scaled down to 24 pixels in size.
+code
+{{:efl-core.png?nolink24|Inlined image with content}}
+/code
-And here is an inlined image, centered.
+
+
+An image that links to the same image if clicked on for a full resolution
display.
-{{ :efl-core.png?nolink |}}
+{{ :efl-core.png |A Linked Image}}
+
+code
+{{ :efl-core.png |A Linked Image}}
+/code
+
+
-Sample code snippets and hilights
+Images inlined and scaled to 16, 32 and 64 pixels in size respectively.
+
+{{:efl-core.png?nolink16|16 Pixels in size}}
+{{:efl-core.png?nolink32|32 Pixels in size}}
+{{:efl-core.png?nolink64|64 Pixels in size}}
+
+code
+{{:efl-core.png?nolink16|16 Pixels in size}}
+{{:efl-core.png?nolink32|32 Pixels in size}}
+{{:efl-core.png?nolink64|64 Pixels in size}}
+/code
+
+
+
+An link to somewhere else with an image
+
+[[http://www.enlightenment.org|{{ :efl-core.png |A Website image link}}]]
+
+code
+[[http://www.enlightenment.org|{{ :efl-core.png |A Website image link}}]]
+/code
+
+
+
+Sample C source code
code c
typedef struct blah Blah;
@@ -147,39 +218,180 @@ Sample code snippets and hilights
}
/code
+file
+code c
+ typedef struct blah Blah;
+ int c;
+ void function(char *blah) {
+double x;
+This_Type *y;
+Type_Here *z;
+int e = ENUM_HERE;
+x = 10;
+char *p = malloc(10);
+evas_object_del(p);
+ }
+/code
+/file
+
+
+
+Sample lua source code
+
code lua
function hello(x)
local y
end
/code
-This should become a link to the [[start]] page. How about the [[blah]]
-page too. Test autolink with evas_object_del() as a keyword.
+file
+code lua
+ function hello(x)
+local y
+ end
+/code
+/file
-Below between the hr's should be an externally included wiki page
+
+
+Sample shall/bash script
+
+code bash
+$ cat blah.txt | grep pants output.txt
+/code
+
+file
+code bash
+$ cat blah.txt | grep pants output.txt
+/code
+/file
-{{pageblah}}
+A raw file content quote
+
+file
+This is a aw segment of file
+verbatim placed in the page as a monospace
+sample section.
+/file
+
+code
+file
+This is a aw segment of file
+verbatim placed in the page as a monospace
+sample section.
+/file
+/code
+
+
+
+EFL functions will auto link such as evas_object_del() and even other types
like Evas_Object and EINA_TRUE will all become links, as long as you have a
''~~CODE-c~~'' at the top of the page indicating which language the page
discusses. There is no need to manually link such things. They also auto-link
from C code quotes like above.
+
+code
+EFL functions will auto link such as evas_object_del() and even other types
like Evas_Object and EINA_TRUE will all become links, as long as you have a
~~CODE-c~~ at the top of the page indicating which language the page discusses.
There is no need to manually link such things. They also auto-link from C code
quotes like above.
+/code
+
+-
+
+You can include another page named ''PAGENAME'' with:
+
+code
+{{pagePAGENAME}}
+/code
-So how about Tables? well let's try one:
+You can do tables like:
+
+^ Header 1 ^ Header Column 2 ^ Column 3 header ^
+| Cell 1 | Cell 2 | Cell 3 |
+| Cell 1 | Cell 2 | Cell 3 |
+| Cell 1 | Cell 2 | Cell 3 |
+| Cell 1 | Cell 2 | Cell 3
[EGIT] [core/elementary] master 01/01: tooltip: set the correct style of label.
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=8826d9ac965992df167ce535f296ff33a487495a
commit 8826d9ac965992df167ce535f296ff33a487495a
Author: Amitesh Singh amitesh...@samsung.com
Date: Tue May 19 18:09:50 2015 +0900
tooltip: set the correct style of label.
Summary:
check theme of tooltip label by
$clouseau elementary_test -to tooltip
tooltipi label theme was elm/label/base/default but we want theme
elm/label/base/tooltip/default to be set instead.
@fix
Test Plan: $clouseau elementary_test -to tooltip
Reviewers: raster, Hermet
Subscribers: seoz, sachin.dev
Differential Revision: https://phab.enlightenment.org/D2509
---
src/lib/els_tooltip.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/lib/els_tooltip.c b/src/lib/els_tooltip.c
index 811c698..fecdb8b 100644
--- a/src/lib/els_tooltip.c
+++ b/src/lib/els_tooltip.c
@@ -735,8 +735,9 @@ _tooltip_label_style_set(Evas_Object *obj, Evas_Object
*label)
{
ELM_TOOLTIP_GET_OR_RETURN(tt, obj);
char buf[100] = {0};
+ const char *style = tt-style ? tt-style : default;
- sprintf(buf, tooltip/%s, tt-style);
+ sprintf(buf, tooltip/%s, style);
if (!elm_object_style_set(label, buf))
{
WRN(Failed to set tooltip label style: %s, reverting to old style,
--
[EGIT] [editors/vim-configs] master 01/01: Eo syntax: Add @property and @beta to syntax.
tasn pushed a commit to branch master.
http://git.enlightenment.org/editors/vim-configs.git/commit/?id=d9a27e2d0ab76b3293fdc2a44a53c75f263d1083
commit d9a27e2d0ab76b3293fdc2a44a53c75f263d1083
Author: Tom Hacohen t...@stosb.com
Date: Tue May 19 09:50:27 2015 +0100
Eo syntax: Add @property and @beta to syntax.
---
syntax/eo.vim | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/syntax/eo.vim b/syntax/eo.vim
index c7fa388..fcf2d89 100644
--- a/syntax/eo.vim
+++ b/syntax/eo.vim
@@ -23,7 +23,7 @@ syn keywordeoStatements return
syn match className \(\w\+\.\)\+\w\+
-syn match attributes
@\(inout\|out\|in\|class\|free\|constructor\|extern\|protected\|const\|optional\|nullable\|warn_unused\|private\)
+syn match attributes
@\(inout\|out\|in\|property\|class\|free\|constructor\|extern\|beta\|protected\|const\|optional\|nullable\|warn_unused\|private\)
syn match eoLabelMatch \w\+: contains=eoClassBodyLabels
syn match eoBlockOpener \w\+\s*{
contains=eoClassBodyBlockOpener,eoInnerBlockOpener
--
[EGIT] [website/www-content] master 01/01: Wiki page download changed with summary [] by Raster
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=71532158430deffc3aa4454e471141d8b2bb938d commit 71532158430deffc3aa4454e471141d8b2bb938d Author: Raster ras...@rasterman.com Date: Tue May 19 02:41:56 2015 -0700 Wiki page download changed with summary [] by Raster --- pages/download.txt | 22 ++ 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/pages/download.txt b/pages/download.txt index 10c8721..f3e3d89 100644 --- a/pages/download.txt +++ b/pages/download.txt @@ -5,19 +5,16 @@ We place all of our releases here: * [[http://download.enlightenment.org/rel/|download.enlightenment.org]] -When compiling from source, our core libraries likely should be build -in this order: +For a list of dependencies and general build infor take a look at [[docs-efl-start]]. But just use the below configure command instead of autogen.sh. Everything else is the same. + +When compiling from source, our core libraries likely should be build in this order: * EFL * Evas Generic Loaders * Emotion Generic Players * Elementary -After this build applications however you like (e.g. Enlightenment, -Terminology etc). Please see the README files for projects for -information on dependencies, configuration etc. Just remember that all -our release tarballs come with configure set up so to compile you just -need to do: +After this build applications however you like (e.g. Enlightenment, Terminology etc). Please see the README files for projects for information on dependencies, configuration etc. Just remember that all our release tarballs come with configure set up so to compile you just need to do: code bash ./configure @@ -33,16 +30,9 @@ Our latest releases are: Source -Out source code is developed collaboratively in a pretty typical open -source manner. Our master branches are where all new development goes -into. We try and keep master working and usable daily, as developers -generally are living off master themselves and so bugs affect -developers directly and immediately. Sometimes issues happen, but -they tend to get fixed rapidly. +Out source code is developed collaboratively in a pretty typical open source manner. Our master branches are where all new development goes into. We try and keep master working and usable daily, as developers generally are living off master themselves and so bugs affect developers directly and immediately. Sometimes issues happen, but they tend to get fixed rapidly. -If you want to track the latest and greatest, please see our git -repositories. If you have issues please refer to our [[contact]] -page to get in touch with us. +If you want to track the latest and greatest, please see our git repositories. If you have issues please refer to our [[contact]] page to get in touch with us. All our git repositories are listed on: --
[EGIT] [website/www-content] master 01/01: Wiki page download changed with summary [] by Raster
WWW-www.enlightenment.org pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=b3d0d91f856b5bfe12359a81e5ba9e7e849b3f96
commit b3d0d91f856b5bfe12359a81e5ba9e7e849b3f96
Author: Raster ras...@rasterman.com
Date: Tue May 19 02:49:49 2015 -0700
Wiki page download changed with summary [] by Raster
---
pages/download.txt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pages/download.txt b/pages/download.txt
index f3e3d89..4a3631c 100644
--- a/pages/download.txt
+++ b/pages/download.txt
@@ -41,3 +41,5 @@ All our git repositories are listed on:
{{pagedownload-e16}}
+
+~~DISCUSSIONS~~
\ No newline at end of file
--
[EGIT] [core/efl] master 01/01: ecore_imf/wayland: hide input panel explicitly in focus-out handler
jihoon pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=82bb9c9c1e96e2ea51e7b696a38103e1a628d5f9
commit 82bb9c9c1e96e2ea51e7b696a38103e1a628d5f9
Author: Jihoon Kim jihoon48@samsung.com
Date: Tue May 19 19:19:54 2015 +0900
ecore_imf/wayland: hide input panel explicitly in focus-out handler
---
src/modules/ecore_imf/wayland/wayland_imcontext.c | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/modules/ecore_imf/wayland/wayland_imcontext.c
b/src/modules/ecore_imf/wayland/wayland_imcontext.c
index 4f2d982..d6679bd 100644
--- a/src/modules/ecore_imf/wayland/wayland_imcontext.c
+++ b/src/modules/ecore_imf/wayland/wayland_imcontext.c
@@ -656,8 +656,13 @@ wayland_im_context_focus_out(Ecore_IMF_Context *ctx)
if (!imcontext-input) return;
if (imcontext-text_input)
- wl_text_input_deactivate(imcontext-text_input,
- ecore_wl_input_seat_get(imcontext-input));
+ {
+if (ecore_imf_context_input_panel_enabled_get(ctx))
+ wl_text_input_hide_input_panel(imcontext-text_input);
+
+wl_text_input_deactivate(imcontext-text_input,
+ ecore_wl_input_seat_get(imcontext-input));
+ }
imcontext-input = NULL;
}
--
[EGIT] [core/elementary] master 01/01: multibuttonentry: Delete unused data in edc.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=2ae332bce7e73df4d54a8ee2ee49a3638576f48e
commit 2ae332bce7e73df4d54a8ee2ee49a3638576f48e
Author: Woochan Lee wc0917@samsung.com
Date: Tue May 19 20:27:19 2015 +0900
multibuttonentry: Delete unused data in edc.
Summary: The closed_height is not using in code.
Reviewers: raster, Hermet
Reviewed By: Hermet
Differential Revision: https://phab.enlightenment.org/D2535
---
data/themes/edc/elm/multibuttonentry.edc | 1 -
1 file changed, 1 deletion(-)
diff --git a/data/themes/edc/elm/multibuttonentry.edc
b/data/themes/edc/elm/multibuttonentry.edc
index d306231..cd0bb5d 100644
--- a/data/themes/edc/elm/multibuttonentry.edc
+++ b/data/themes/edc/elm/multibuttonentry.edc
@@ -1,5 +1,4 @@
group { name: elm/multibuttonentry/base/default;
- data.item: closed_height 0;
parts {
part { name: box.swallow; type: SWALLOW;
description { state: default 0.0;
--
[EGIT] [core/elementary] master 01/01: [Elm_ColorSelector]: Unnecessary widget creations, code execution avoided.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=6b453e8d8cdf861ee9ad8e34703b51ef8f50101a
commit 6b453e8d8cdf861ee9ad8e34703b51ef8f50101a
Author: shilpa.singh shilpa.si...@samsung.com
Date: Tue May 19 20:56:48 2015 +0900
[Elm_ColorSelector]: Unnecessary widget creations, code execution avoided.
Summary:
Issue: Too many widgets get created during smart add itself, even if
not necessary, adding to the launch time.
Solution:
Create widgets based on mode, check for modes in generic functions
like smart theme, focus etc:-
Test Plan: elementary_test can be used to test colorselector demo.
Reviewers: cedric, raster, Hermet
Subscribers: rajeshps, govi, poornima.srinivasan
Differential Revision: https://phab.enlightenment.org/D2532
---
src/lib/elm_colorselector.c | 326 ++--
1 file changed, 191 insertions(+), 135 deletions(-)
diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index 650e0c6..0fbfda6 100644
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -402,7 +402,8 @@ _update_hsla_from_colorbar(Evas_Object *obj, Color_Type
type, double x)
if (type != ALPHA !_hsl_to_rgb(sd)) return;
_update_colorbars(sd);
- _color_picker_init(sd);
+ if ((sd-mode == ELM_COLORSELECTOR_ALL) || (sd-mode ==
ELM_COLORSELECTOR_PICKER))
+ _color_picker_init(sd);
evas_object_smart_callback_call(obj, SIG_CHANGED, NULL);
evas_object_smart_callback_call(obj, SIG_CHANGED_USER, NULL);
}
@@ -426,34 +427,39 @@ _colors_set(Evas_Object *obj,
sd-b = b;
sd-a = a;
- _rgb_to_hsl(sd);
+ if ((sd-mode == ELM_COLORSELECTOR_ALL) || (sd-mode ==
ELM_COLORSELECTOR_COMPONENTS)
+ || (sd-mode == ELM_COLORSELECTOR_BOTH))
+ {
+_rgb_to_hsl(sd);
- edje_object_part_drag_value_get
- (sd-cb_data[0]-colorbar, elm.arrow, x, y);
- x = sd-h / 360.0;
- edje_object_part_drag_value_set
- (sd-cb_data[0]-colorbar, elm.arrow, x, y);
- _update_ergb(sd, x);
+edje_object_part_drag_value_get
+ (sd-cb_data[0]-colorbar, elm.arrow, x, y);
+x = sd-h / 360.0;
+edje_object_part_drag_value_set
+ (sd-cb_data[0]-colorbar, elm.arrow, x, y);
+_update_ergb(sd, x);
- edje_object_part_drag_value_get
- (sd-cb_data[1]-colorbar, elm.arrow, x, y);
- x = 1.0 - sd-s;
- edje_object_part_drag_value_set
- (sd-cb_data[1]-colorbar, elm.arrow, x, y);
+edje_object_part_drag_value_get
+ (sd-cb_data[1]-colorbar, elm.arrow, x, y);
+x = 1.0 - sd-s;
+edje_object_part_drag_value_set
+ (sd-cb_data[1]-colorbar, elm.arrow, x, y);
- edje_object_part_drag_value_get
- (sd-cb_data[2]-colorbar, elm.arrow, x, y);
- x = sd-l;
- edje_object_part_drag_value_set(sd-cb_data[2]-colorbar, elm.arrow, x,
y);
+edje_object_part_drag_value_get
+ (sd-cb_data[2]-colorbar, elm.arrow, x, y);
+x = sd-l;
+edje_object_part_drag_value_set(sd-cb_data[2]-colorbar, elm.arrow,
x, y);
- edje_object_part_drag_value_get
- (sd-cb_data[3]-colorbar, elm.arrow, x, y);
- x = sd-a / 255.0;
- edje_object_part_drag_value_set
- (sd-cb_data[3]-colorbar, elm.arrow, x, y);
+edje_object_part_drag_value_get
+ (sd-cb_data[3]-colorbar, elm.arrow, x, y);
+x = sd-a / 255.0;
+edje_object_part_drag_value_set
+ (sd-cb_data[3]-colorbar, elm.arrow, x, y);
- _update_colorbars(sd);
- _color_picker_init(sd);
+_update_colorbars(sd);
+ }
+ if ((sd-mode == ELM_COLORSELECTOR_ALL) || (sd-mode ==
ELM_COLORSELECTOR_PICKER))
+ _color_picker_init(sd);
evas_object_smart_callback_call(obj, SIG_CHANGED, NULL);
}
@@ -660,7 +666,7 @@ _mouse_out_canvas(void *data, Evas *e EINA_UNUSED, void
*event_info EINA_UNUSED)
}
static void
-_color_picker_add(Evas_Object *obj, Elm_Colorselector_Data *sd)
+_create_colorpicker(Evas_Object *obj)
{
Evas_Object *ed;
Evas_Object *im;
@@ -668,6 +674,9 @@ _color_picker_add(Evas_Object *obj, Elm_Colorselector_Data
*sd)
Evas_Object *bx;
Eina_Stringshare *style;
int i;
+
+ ELM_COLORSELECTOR_DATA_GET(obj, sd);
+ if (sd-picker) return;
#ifdef HAVE_ELEMENTARY_X
Ecore_X_Window xwin;
@@ -678,6 +687,14 @@ _color_picker_add(Evas_Object *obj, Elm_Colorselector_Data
*sd)
ecore_x_input_raw_select(sd-grab.xroot);
}
#endif
+ /* setup the color picker */
+ sd-picker = elm_layout_add(obj);
+ if (!elm_layout_theme_set(sd-picker, colorselector, picker/base,
elm_widget_style_get(obj)))
+ CRI(Failed to set layout!);
+
+ evas_object_size_hint_weight_set(sd-picker, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(sd-picker, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_widget_sub_object_add(obj, sd-picker);
bx = elm_box_add(sd-picker);
[EGIT] [core/elementary] master 01/01: slider: use theme of object for popup.
hermet pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=b3a4d8b888d8187d357448e49e81cb319367fbda commit b3a4d8b888d8187d357448e49e81cb319367fbda Author: Amitesh Singh amitesh...@samsung.com Date: Tue May 19 21:02:55 2015 +0900 slider: use theme of object for popup. Summary: @fix Signed-off-by: Amitesh Singh amitesh...@samsung.com Reviewers: raster, Hermet, JackDanielZ Subscribers: sachin.dev, seoz Differential Revision: https://phab.enlightenment.org/D2542 --- src/lib/elm_slider.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c index 79a063e..361b807 100644 --- a/src/lib/elm_slider.c +++ b/src/lib/elm_slider.c @@ -507,9 +507,9 @@ _popup_add(Elm_Slider_Data *sd, Eo *obj) sd-popup = edje_object_add(evas_object_evas_get(obj)); evas_object_smart_member_add(sd-popup, obj); if (sd-horizontal) - _elm_theme_set(NULL, sd-popup, slider, horizontal/popup, elm_widget_style_get(obj)); + _elm_theme_set(elm_widget_theme_get(obj), sd-popup, slider, horizontal/popup, elm_widget_style_get(obj)); else - _elm_theme_set(NULL, sd-popup, slider, vertical/popup, elm_widget_style_get(obj)); + _elm_theme_set(elm_widget_theme_get(obj), sd-popup, slider, vertical/popup, elm_widget_style_get(obj)); edje_object_scale_set(sd-popup, elm_widget_scale_get(obj) * elm_config_scale_get()); edje_object_signal_callback_add(sd-popup, popup,hide,done, elm, // XXX: for compat --
[EGIT] [core/elementary] elementary-1.14 01/01: slider: use theme of object for popup.
hermet pushed a commit to branch elementary-1.14. http://git.enlightenment.org/core/elementary.git/commit/?id=82e1d4f7b2289d8382d04521a82e0d0394d039fa commit 82e1d4f7b2289d8382d04521a82e0d0394d039fa Author: Amitesh Singh amitesh...@samsung.com Date: Tue May 19 21:02:55 2015 +0900 slider: use theme of object for popup. Summary: @fix Signed-off-by: Amitesh Singh amitesh...@samsung.com Reviewers: raster, Hermet, JackDanielZ Subscribers: sachin.dev, seoz Differential Revision: https://phab.enlightenment.org/D2542 --- src/lib/elm_slider.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c index 79a063e..361b807 100644 --- a/src/lib/elm_slider.c +++ b/src/lib/elm_slider.c @@ -507,9 +507,9 @@ _popup_add(Elm_Slider_Data *sd, Eo *obj) sd-popup = edje_object_add(evas_object_evas_get(obj)); evas_object_smart_member_add(sd-popup, obj); if (sd-horizontal) - _elm_theme_set(NULL, sd-popup, slider, horizontal/popup, elm_widget_style_get(obj)); + _elm_theme_set(elm_widget_theme_get(obj), sd-popup, slider, horizontal/popup, elm_widget_style_get(obj)); else - _elm_theme_set(NULL, sd-popup, slider, vertical/popup, elm_widget_style_get(obj)); + _elm_theme_set(elm_widget_theme_get(obj), sd-popup, slider, vertical/popup, elm_widget_style_get(obj)); edje_object_scale_set(sd-popup, elm_widget_scale_get(obj) * elm_config_scale_get()); edje_object_signal_callback_add(sd-popup, popup,hide,done, elm, // XXX: for compat --
[EGIT] [core/elementary] elementary-1.14 01/01: Patch to fix accessibility issue in coloselector item.
hermet pushed a commit to branch elementary-1.14.
http://git.enlightenment.org/core/elementary.git/commit/?id=1ff3728e769d3733241b3923c15b151a10b57b2f
commit 1ff3728e769d3733241b3923c15b151a10b57b2f
Author: kumar navneet k.navn...@samsung.com
Date: Tue May 19 21:09:38 2015 +0900
Patch to fix accessibility issue in coloselector item.
Summary:
Issue: accessibility not working in colorselector item
Soln: Fixed accessibility issue
Signed-off By: Kumar Navneet k.navn...@samsung.com
Signed-off By: Shilpa Singh shilpa.si...@samsung.com
Test Plan: export ELM_ACCESS_MODE=1, run elementary test and test color
selector palette item.
Reviewers: cedric, Hermet, shilpasingh, raster
Reviewed By: shilpasingh
Subscribers: govi, poornima.srinivasan
Differential Revision: https://phab.enlightenment.org/D2496
---
src/lib/elm_colorselector.c | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index 650e0c6..300987e 100644
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -1382,6 +1382,16 @@ _access_info_cb(void *data, Evas_Object *obj EINA_UNUSED)
return ret;
}
+static void
+_access_activate_cb(void *data EINA_UNUSED,
+Evas_Object *part_obj EINA_UNUSED,
+Elm_Object_Item *eo_item)
+{
+ ELM_COLOR_ITEM_DATA_GET(eo_item, item);
+ elm_object_item_signal_emit(eo_item, elm,state,selected, elm);
+ _on_color_released(item, NULL, NULL, NULL);
+}
+
EOLIAN static Evas_Object*
_elm_color_item_elm_widget_item_access_register(Eo *eo_it, Elm_Color_Item_Data
*it)
{
@@ -1393,7 +1403,8 @@ _elm_color_item_elm_widget_item_access_register(Eo
*eo_it, Elm_Color_Item_Data *
ai = _elm_access_info_get(it-base-access_obj);
_elm_access_text_set(ai, ELM_ACCESS_TYPE, E_(color selector palette
item));
- _elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, eo_it);
+ _elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it);
+ _elm_access_activate_callback_set(ai, _access_activate_cb, EO_OBJ(it));
return res;
}
@@ -1453,7 +1464,7 @@ _elm_color_item_eo_base_constructor(Eo *eo_item,
Elm_Color_Item_Data *item)
// ACCESS
if (_elm_config-access_mode == ELM_ACCESS_MODE_ON)
- eo_do(obj, elm_wdg_item_access_register());
+ eo_do(eo_item, elm_wdg_item_access_register());
}
EOLIAN static void
--
[EGIT] [core/elementary] master 01/01: Patch to fix accessibility issue in coloselector item.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=b4aef271e23de1cb6e1f34d2764e8b87690dcecd
commit b4aef271e23de1cb6e1f34d2764e8b87690dcecd
Author: kumar navneet k.navn...@samsung.com
Date: Tue May 19 21:09:38 2015 +0900
Patch to fix accessibility issue in coloselector item.
Summary:
Issue: accessibility not working in colorselector item
Soln: Fixed accessibility issue
Signed-off By: Kumar Navneet k.navn...@samsung.com
Signed-off By: Shilpa Singh shilpa.si...@samsung.com
Test Plan: export ELM_ACCESS_MODE=1, run elementary test and test color
selector palette item.
Reviewers: cedric, Hermet, shilpasingh, raster
Reviewed By: shilpasingh
Subscribers: govi, poornima.srinivasan
Differential Revision: https://phab.enlightenment.org/D2496
---
src/lib/elm_colorselector.c | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index 0fbfda6..7ffbf68 100644
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -1410,6 +1410,16 @@ _access_info_cb(void *data, Evas_Object *obj EINA_UNUSED)
return ret;
}
+static void
+_access_activate_cb(void *data EINA_UNUSED,
+Evas_Object *part_obj EINA_UNUSED,
+Elm_Object_Item *eo_item)
+{
+ ELM_COLOR_ITEM_DATA_GET(eo_item, item);
+ elm_object_item_signal_emit(eo_item, elm,state,selected, elm);
+ _on_color_released(item, NULL, NULL, NULL);
+}
+
EOLIAN static Evas_Object*
_elm_color_item_elm_widget_item_access_register(Eo *eo_it, Elm_Color_Item_Data
*it)
{
@@ -1421,7 +1431,8 @@ _elm_color_item_elm_widget_item_access_register(Eo
*eo_it, Elm_Color_Item_Data *
ai = _elm_access_info_get(it-base-access_obj);
_elm_access_text_set(ai, ELM_ACCESS_TYPE, E_(color selector palette
item));
- _elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, eo_it);
+ _elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it);
+ _elm_access_activate_callback_set(ai, _access_activate_cb, EO_OBJ(it));
return res;
}
@@ -1481,7 +1492,7 @@ _elm_color_item_eo_base_constructor(Eo *eo_item,
Elm_Color_Item_Data *item)
// ACCESS
if (_elm_config-access_mode == ELM_ACCESS_MODE_ON)
- eo_do(obj, elm_wdg_item_access_register());
+ eo_do(eo_item, elm_wdg_item_access_register());
}
EOLIAN static void
--
[EGIT] [core/elementary] master 01/01: ctxpopup: Added item_focus_set/item_focus_get.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=667744182dbebc458c6065fc9b6c80a3c41ac761
commit 667744182dbebc458c6065fc9b6c80a3c41ac761
Author: Amitesh Singh amitesh...@samsung.com
Date: Tue May 19 21:21:06 2015 +0900
ctxpopup: Added item_focus_set/item_focus_get.
Summary: @feature
Reviewers: raster, Hermet
Reviewed By: Hermet
Subscribers: seoz, sachin.dev
Differential Revision: https://phab.enlightenment.org/D2439
Conflicts:
src/lib/elm_ctxpopup_item.eo
---
src/lib/elc_ctxpopup.c | 15 +++
src/lib/elc_ctxpopup.h | 2 ++
src/lib/elm_ctxpopup_item.eo | 2 ++
3 files changed, 19 insertions(+)
diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index 543351c..f84cc0f 100644
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -927,6 +927,21 @@ _elm_ctxpopup_item_elm_widget_item_signal_emit(Eo
*eo_ctxpopup_it EINA_UNUSED,
elm_object_item_signal_emit(ctxpopup_it-list_item, emission, source);
}
+EOLIAN static void
+_elm_ctxpopup_item_elm_widget_item_focus_set(Eo *eo_ctxpopup_it EINA_UNUSED,
+ Elm_Ctxpopup_Item_Data
*ctxpopup_it,
+ Eina_Bool focused)
+{
+ elm_object_item_focus_set(ctxpopup_it-list_item, focused);
+}
+
+EOLIAN static Eina_Bool
+_elm_ctxpopup_item_elm_widget_item_focus_get(Eo *eo_ctxpopup_it EINA_UNUSED,
+ Elm_Ctxpopup_Item_Data
*ctxpopup_it)
+{
+ return elm_object_item_focus_get(ctxpopup_it-list_item);
+}
+
static void
_bg_clicked_cb(void *data,
Evas_Object *obj EINA_UNUSED,
diff --git a/src/lib/elc_ctxpopup.h b/src/lib/elc_ctxpopup.h
index dc93ffa..1ad3de2 100644
--- a/src/lib/elc_ctxpopup.h
+++ b/src/lib/elc_ctxpopup.h
@@ -53,6 +53,8 @@
* @li @ref elm_object_item_part_content_set
* @li @ref elm_object_item_part_content_get
* @li @ref elm_object_item_signal_emit
+ * @li @ref elm_object_item_focus_set
+ * @li @ref elm_object_item_focus_get
*
* @ref tutorial_ctxpopup shows the usage of a good deal of the API.
* @{
diff --git a/src/lib/elm_ctxpopup_item.eo b/src/lib/elm_ctxpopup_item.eo
index 6fd5ac4..e5c324b 100644
--- a/src/lib/elm_ctxpopup_item.eo
+++ b/src/lib/elm_ctxpopup_item.eo
@@ -52,5 +52,7 @@ class Elm.Ctxpopup_Item(Elm.Widget_Item)
Elm.Widget_Item.part_text.set;
Elm.Widget_Item.part_content.get;
Elm.Widget_Item.part_content.set;
+Elm.Widget_Item.focus.set;
+Elm.Widget_Item.focus.get;
}
}
--
[EGIT] [core/elementary] master 01/01: hoversel: Added item_focus_set/item_focus_get.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=0722fcbeb1181590972bfec1d303c32e628b6fc1
commit 0722fcbeb1181590972bfec1d303c32e628b6fc1
Author: Amitesh Singh amitesh...@samsung.com
Date: Tue May 19 21:24:35 2015 +0900
hoversel: Added item_focus_set/item_focus_get.
Summary: @feature
Reviewers: seoz, Hermet, raster
Subscribers: seoz, sachin.dev
Differential Revision: https://phab.enlightenment.org/D2436
Conflicts:
src/lib/elm_hoversel_item.eo
---
src/lib/elc_hoversel.c | 15 +++
src/lib/elc_hoversel.h | 2 ++
src/lib/elm_hoversel_item.eo | 2 ++
3 files changed, 19 insertions(+)
diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c
index f69fccb..8695804 100644
--- a/src/lib/elc_hoversel.c
+++ b/src/lib/elc_hoversel.c
@@ -268,6 +268,21 @@ _elm_hoversel_item_elm_widget_item_style_get(Eo *eo_it
EINA_UNUSED,
}
EOLIAN static void
+_elm_hoversel_item_elm_widget_item_focus_set(Eo *eo_it EINA_UNUSED,
+ Elm_Hoversel_Item_Data *it,
+ Eina_Bool focused)
+{
+ elm_widget_focus_set(VIEW(it), focused);
+}
+
+EOLIAN static Eina_Bool
+_elm_hoversel_item_elm_widget_item_focus_get(Eo *eo_it EINA_UNUSED,
+ Elm_Hoversel_Item_Data *it)
+{
+ return elm_widget_focus_get(VIEW(it));
+}
+
+EOLIAN static void
_elm_hoversel_item_eo_base_destructor(Eo *eo_item, Elm_Hoversel_Item_Data
*item)
{
ELM_HOVERSEL_DATA_GET_OR_RETURN(WIDGET(item), sd);
diff --git a/src/lib/elc_hoversel.h b/src/lib/elc_hoversel.h
index ef52aca..8296c16 100644
--- a/src/lib/elc_hoversel.h
+++ b/src/lib/elc_hoversel.h
@@ -50,6 +50,8 @@
* @li elm_object_item_signal_emit - this works only when the item is created.
* @li elm_object_item_style_set - this works only when the item is created.
* @li elm_object_item_style_get - this works only when the item is created.
+ * @li elm_object_item_focus_set - this works only when the item is created.
+ * @li elm_object_item_focus_get - this works only when the item is created.
*
* See @ref tutorial_hoversel for an example.
* @{
diff --git a/src/lib/elm_hoversel_item.eo b/src/lib/elm_hoversel_item.eo
index 34e7013..237a891 100644
--- a/src/lib/elm_hoversel_item.eo
+++ b/src/lib/elm_hoversel_item.eo
@@ -38,5 +38,7 @@ class Elm.Hoversel_Item(Elm.Widget_Item)
Elm.Widget_Item.part_text.get;
Elm.Widget_Item.style.get;
Elm.Widget_Item.style.set;
+Elm.Widget_Item.focus.set;
+Elm.Widget_Item.focus.get;
}
}
--
[EGIT] [core/elementary] elementary-1.14 02/02: scroller: add example for resizing scroll's content area.
hermet pushed a commit to branch elementary-1.14.
http://git.enlightenment.org/core/elementary.git/commit/?id=69f369db84a4bedbaca16be86ff6311f44c2c46e
commit 69f369db84a4bedbaca16be86ff6311f44c2c46e
Author: Hosang Kim hosang12@samsung.com
Date: Tue May 19 21:55:49 2015 +0900
scroller: add example for resizing scroll's content area.
Summary:
When content is resized, scrollbar's position is not updated.
Add bar position update after bar size is changed.
This is sample for resizing issue.
Test Plan: elementary_test - scroller3
Reviewers: jaehwan, woohyun, seoz, raster, Hermet
Subscribers: raster
Differential Revision: https://phab.enlightenment.org/D2291
---
src/bin/test.c | 2 +
src/bin/test_scroller.c | 141
2 files changed, 143 insertions(+)
diff --git a/src/bin/test.c b/src/bin/test.c
index 2af3706..9a7de33 100644
--- a/src/bin/test.c
+++ b/src/bin/test.c
@@ -148,6 +148,7 @@ void test_fileselector(void *data, Evas_Object *obj, void
*event_info);
void test_separator(void *data, Evas_Object *obj, void *event_info);
void test_scroller(void *data, Evas_Object *obj, void *event_info);
void test_scroller2(void *data, Evas_Object *obj, void *event_info);
+void test_scroller3(void *data, Evas_Object *obj, void *event_info);
void test_spinner(void *data, Evas_Object *obj, void *event_info);
void test_index(void *data, Evas_Object *obj, void *event_info);
void test_index2(void *data, Evas_Object *obj, void *event_info);
@@ -746,6 +747,7 @@ add_tests:
//--//
ADD_TEST(NULL, Scroller, Scroller, test_scroller);
ADD_TEST(NULL, Scroller, Scroller 2, test_scroller2);
+ ADD_TEST(NULL, Scroller, Scroller 3, test_scroller3);
//--//
// FIXME: add frame test
diff --git a/src/bin/test_scroller.c b/src/bin/test_scroller.c
index 8457e92..470a1f4 100644
--- a/src/bin/test_scroller.c
+++ b/src/bin/test_scroller.c
@@ -473,3 +473,144 @@ test_scroller2(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event
evas_object_resize(win, 320, 480);
evas_object_show(win);
}
+
+static Ecore_Timer *timer = NULL;
+static int append = 0;
+static int count = 0;
+
+void
+del_item(void *data EINA_UNUSED, Evas_Object *obj, void *event_info
EINA_UNUSED)
+{
+ evas_object_del(obj);
+}
+
+void
+append_item(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
+{
+ Evas_Object *bx = data, *bt;
+ char buf[PATH_MAX];
+
+ bt = elm_button_add(bx);
+ snprintf(buf, sizeof(buf), Item %d, ++count);
+ elm_object_text_set(bt, buf);
+ elm_box_pack_end(bx, bt);
+ evas_object_smart_callback_add(bt, clicked, del_item, NULL);
+ evas_object_show(bt);
+}
+
+void
+prepend_item(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
+{
+ Evas_Object *bx = data, *bt;
+ char buf[PATH_MAX];
+
+ bt = elm_button_add(bx);
+ snprintf(buf, sizeof(buf), Item %d, ++count);
+ elm_object_text_set(bt, buf);
+ elm_box_pack_start(bx, bt);
+ evas_object_smart_callback_add(bt, clicked, del_item, NULL);
+ evas_object_show(bt);
+}
+
+static Eina_Bool
+append_cb(void *data)
+{
+ Evas_Object *bx = data, *bt;
+ char buf[PATH_MAX];
+
+ bt = elm_button_add(bx);
+ snprintf(buf, sizeof(buf), Item %d, ++count);
+ elm_object_text_set(bt, buf);
+ elm_box_pack_end(bx, bt);
+ evas_object_smart_callback_add(bt, clicked, del_item, NULL);
+ evas_object_show(bt);
+
+ append--;
+
+ if (append = 0)
+ {
+timer = NULL;
+return ECORE_CALLBACK_CANCEL;
+ }
+ else
+ return ECORE_CALLBACK_RENEW;
+}
+
+static void
+append_items(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
+{
+ append += 10;
+ timer = ecore_timer_add(0.3, append_cb, data);
+}
+
+static void
+win_del_cb(void *data EINA_UNUSED,
+ Evas *e EINA_UNUSED,
+ Evas_Object *obj EINA_UNUSED,
+ void *event_info EINA_UNUSED)
+{
+ ecore_timer_del(timer);
+ timer = NULL;
+}
+
+void
+test_scroller3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
+{
+ Evas_Object *win, *bt, *bt2, *bt3, *bx, *bx2, *bx3, *bx4, *sc;
+
+ win = elm_win_util_standard_add(scroller3, Scroller 3);
+ elm_win_autodel_set(win, EINA_TRUE);
+ evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, win_del_cb, NULL);
+
+ bx = elm_box_add(win);
+ evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ elm_win_resize_object_add(win, bx);
+ evas_object_show(bx);
+
+ bx2 = elm_box_add(bx);
+ evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.1);
+ evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_box_horizontal_set(bx2, EINA_TRUE);
+ elm_box_pack_end(bx, bx2);
+ evas_object_show(bx2);
+
+ bt = elm_button_add(bx2);
+ elm_object_text_set(bt,
[EGIT] [core/efl] master 01/01: eolian: initial lex/parse for import statement
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=8834f8e02d37953b3a84d6946fc86b494dd3ea69
commit 8834f8e02d37953b3a84d6946fc86b494dd3ea69
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Tue May 19 14:25:45 2015 +0100
eolian: initial lex/parse for import statement
---
src/lib/eolian/eo_lexer.h | 2 +-
src/lib/eolian/eo_parser.c | 7 +++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h
index 2840bff..5f9c571 100644
--- a/src/lib/eolian/eo_lexer.h
+++ b/src/lib/eolian/eo_lexer.h
@@ -26,7 +26,7 @@ enum Tokens
\
KW(abstract), KW(constructor), KW(constructors), KW(data), \
KW(destructor), KW(eo), KW(eo_prefix), KW(events), KW(free), \
-KW(get), KW(implements), KW(interface), KW(keys), KW(legacy), \
+KW(get), KW(implements), KW(import), KW(interface), KW(keys), KW(legacy), \
KW(legacy_prefix), KW(methods), KW(mixin), KW(own), KW(params), \
KW(set), KW(type), KW(values), KW(var), KWAT(auto), KWAT(beta), \
KWAT(c_only), KWAT(class), KWAT(const), KWAT(const_get), \
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index f4dc5d2..24089aa 100644
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -1789,6 +1789,13 @@ parse_unit(Eo_Lexer *ls, Eina_Bool eot)
if (eot) goto def;
parse_class(ls, EOLIAN_CLASS_INTERFACE);
goto found_class;
+ case KW_import:
+{
+ eo_lexer_get(ls);
+ check_next(ls, TOK_VALUE);
+ check_next(ls, ';');
+ break;
+}
case KW_type:
{
database_type_add(parse_typedef(ls));
--
[EGIT] [core/elementary] elementary-1.14 01/01: [ELM] elm_toolbar: Use item sizing eval function.
hermet pushed a commit to branch elementary-1.14.
http://git.enlightenment.org/core/elementary.git/commit/?id=d5e0d0076e932cc5d49728358b097a7a9f6d4238
commit d5e0d0076e932cc5d49728358b097a7a9f6d4238
Author: Subodh Kumar s7158.ku...@samsung.com
Date: Tue May 19 21:34:29 2015 +0900
[ELM] elm_toolbar: Use item sizing eval function.
Summary:
Item sizing evaluation function can be used instead of repeating the same
code.
Test Plan: NA
Reviewers: herb, shilpasingh, cedric, Hermet
Reviewed By: shilpasingh
Subscribers: poornima.srinivasan
Differential Revision: https://phab.enlightenment.org/D2486
---
src/lib/elm_toolbar.c | 8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 0087a0a..9d41844 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -1309,7 +1309,6 @@ _inform_item_number(Evas_Object *obj)
char buf[sizeof(elm,number,item,) + 4];
static int scount = 0;
int count = 0;
- Evas_Coord mw, mh;
EINA_INLIST_FOREACH(sd-items, it)
{
@@ -1327,12 +1326,7 @@ _inform_item_number(Evas_Object *obj)
{
edje_object_signal_emit(VIEW(it), buf, elm);
edje_object_message_signal_process(VIEW(it));
-
- mw = mh = -1;
- elm_coords_finger_size_adjust(1, mw, 1, mh);
-
- edje_object_size_min_restricted_calc(VIEW(it), mw, mh, mw,
mh);
- evas_object_size_hint_min_set(VIEW(it), mw, mh);
+ _resizing_eval_item(it);
}
}
}
--
[EGIT] [core/elementary] elementary-1.14 01/01: Revert [ELM] elm_toolbar: Use item sizing eval function.
hermet pushed a commit to branch elementary-1.14.
http://git.enlightenment.org/core/elementary.git/commit/?id=1292778c8016184641735af2b79092f314f16764
commit 1292778c8016184641735af2b79092f314f16764
Author: ChunEon Park her...@hermet.pe.kr
Date: Tue May 19 21:59:35 2015 +0900
Revert [ELM] elm_toolbar: Use item sizing eval function.
This reverts commit d5e0d0076e932cc5d49728358b097a7a9f6d4238.
ahh. i didn't intend this.
---
src/lib/elm_toolbar.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 9d41844..0087a0a 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -1309,6 +1309,7 @@ _inform_item_number(Evas_Object *obj)
char buf[sizeof(elm,number,item,) + 4];
static int scount = 0;
int count = 0;
+ Evas_Coord mw, mh;
EINA_INLIST_FOREACH(sd-items, it)
{
@@ -1326,7 +1327,12 @@ _inform_item_number(Evas_Object *obj)
{
edje_object_signal_emit(VIEW(it), buf, elm);
edje_object_message_signal_process(VIEW(it));
- _resizing_eval_item(it);
+
+ mw = mh = -1;
+ elm_coords_finger_size_adjust(1, mw, 1, mh);
+
+ edje_object_size_min_restricted_calc(VIEW(it), mw, mh, mw,
mh);
+ evas_object_size_hint_min_set(VIEW(it), mw, mh);
}
}
}
--
[EGIT] [core/elementary] master 01/01: scroller: add example for resizing scroll's content area.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=02c284e7d368a204912a7f3f172434d55117b66b
commit 02c284e7d368a204912a7f3f172434d55117b66b
Author: ChunEon Park her...@hermet.pe.kr
Date: Tue May 19 22:00:18 2015 +0900
scroller: add example for resizing scroll's content area.
Summary:
When content is resized, scrollbar's position is not updated.
Add bar position update after bar size is changed.
This is sample for resizing issue.
Test Plan: elementary_test - scroller3
Reviewers: jaehwan, woohyun, seoz, raster, Hermet
Reviewed By: Hermet
Subscribers: raster
Differential Revision: https://phab.enlightenment.org/D2291
---
src/bin/test.c | 2 +
src/bin/test_scroller.c | 141
2 files changed, 143 insertions(+)
diff --git a/src/bin/test.c b/src/bin/test.c
index 2af3706..9a7de33 100644
--- a/src/bin/test.c
+++ b/src/bin/test.c
@@ -148,6 +148,7 @@ void test_fileselector(void *data, Evas_Object *obj, void
*event_info);
void test_separator(void *data, Evas_Object *obj, void *event_info);
void test_scroller(void *data, Evas_Object *obj, void *event_info);
void test_scroller2(void *data, Evas_Object *obj, void *event_info);
+void test_scroller3(void *data, Evas_Object *obj, void *event_info);
void test_spinner(void *data, Evas_Object *obj, void *event_info);
void test_index(void *data, Evas_Object *obj, void *event_info);
void test_index2(void *data, Evas_Object *obj, void *event_info);
@@ -746,6 +747,7 @@ add_tests:
//--//
ADD_TEST(NULL, Scroller, Scroller, test_scroller);
ADD_TEST(NULL, Scroller, Scroller 2, test_scroller2);
+ ADD_TEST(NULL, Scroller, Scroller 3, test_scroller3);
//--//
// FIXME: add frame test
diff --git a/src/bin/test_scroller.c b/src/bin/test_scroller.c
index 8457e92..470a1f4 100644
--- a/src/bin/test_scroller.c
+++ b/src/bin/test_scroller.c
@@ -473,3 +473,144 @@ test_scroller2(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event
evas_object_resize(win, 320, 480);
evas_object_show(win);
}
+
+static Ecore_Timer *timer = NULL;
+static int append = 0;
+static int count = 0;
+
+void
+del_item(void *data EINA_UNUSED, Evas_Object *obj, void *event_info
EINA_UNUSED)
+{
+ evas_object_del(obj);
+}
+
+void
+append_item(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
+{
+ Evas_Object *bx = data, *bt;
+ char buf[PATH_MAX];
+
+ bt = elm_button_add(bx);
+ snprintf(buf, sizeof(buf), Item %d, ++count);
+ elm_object_text_set(bt, buf);
+ elm_box_pack_end(bx, bt);
+ evas_object_smart_callback_add(bt, clicked, del_item, NULL);
+ evas_object_show(bt);
+}
+
+void
+prepend_item(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
+{
+ Evas_Object *bx = data, *bt;
+ char buf[PATH_MAX];
+
+ bt = elm_button_add(bx);
+ snprintf(buf, sizeof(buf), Item %d, ++count);
+ elm_object_text_set(bt, buf);
+ elm_box_pack_start(bx, bt);
+ evas_object_smart_callback_add(bt, clicked, del_item, NULL);
+ evas_object_show(bt);
+}
+
+static Eina_Bool
+append_cb(void *data)
+{
+ Evas_Object *bx = data, *bt;
+ char buf[PATH_MAX];
+
+ bt = elm_button_add(bx);
+ snprintf(buf, sizeof(buf), Item %d, ++count);
+ elm_object_text_set(bt, buf);
+ elm_box_pack_end(bx, bt);
+ evas_object_smart_callback_add(bt, clicked, del_item, NULL);
+ evas_object_show(bt);
+
+ append--;
+
+ if (append = 0)
+ {
+timer = NULL;
+return ECORE_CALLBACK_CANCEL;
+ }
+ else
+ return ECORE_CALLBACK_RENEW;
+}
+
+static void
+append_items(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
+{
+ append += 10;
+ timer = ecore_timer_add(0.3, append_cb, data);
+}
+
+static void
+win_del_cb(void *data EINA_UNUSED,
+ Evas *e EINA_UNUSED,
+ Evas_Object *obj EINA_UNUSED,
+ void *event_info EINA_UNUSED)
+{
+ ecore_timer_del(timer);
+ timer = NULL;
+}
+
+void
+test_scroller3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
+{
+ Evas_Object *win, *bt, *bt2, *bt3, *bx, *bx2, *bx3, *bx4, *sc;
+
+ win = elm_win_util_standard_add(scroller3, Scroller 3);
+ elm_win_autodel_set(win, EINA_TRUE);
+ evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, win_del_cb, NULL);
+
+ bx = elm_box_add(win);
+ evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ elm_win_resize_object_add(win, bx);
+ evas_object_show(bx);
+
+ bx2 = elm_box_add(bx);
+ evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.1);
+ evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_box_horizontal_set(bx2, EINA_TRUE);
+ elm_box_pack_end(bx, bx2);
+ evas_object_show(bx2);
+
+ bt = elm_button_add(bx2);
+
[EGIT] [core/elementary] elementary-1.14 01/01: entry: update selection handlers when entry is resized
hermet pushed a commit to branch elementary-1.14. http://git.enlightenment.org/core/elementary.git/commit/?id=8e73bbf8ca0461915ad85eaadb54133eb9100b05 commit 8e73bbf8ca0461915ad85eaadb54133eb9100b05 Author: Thiep Ha thie...@gmail.com Date: Tue May 19 21:13:55 2015 +0900 entry: update selection handlers when entry is resized Summary: When entry is resized, selection handlers are not updated, it causes selection handlers to be placed in wrong position. This patch fixes it. @fix Reviewers: woohyun, seoz, herdsman, Hermet Reviewed By: Hermet Differential Revision: https://phab.enlightenment.org/D2487 --- src/lib/elm_entry.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c index 9e2e743..d8eee9a 100644 --- a/src/lib/elm_entry.c +++ b/src/lib/elm_entry.c @@ -3649,7 +3649,8 @@ _elm_entry_evas_object_smart_resize(Eo *obj, Elm_Entry_Data *sd, Evas_Coord w, E eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h)); evas_object_resize(sd-hit_rect, w, h); - + if (sd-have_selection) + _update_selection_handler(obj); } EOLIAN static void --
[EGIT] [core/elementary] master 01/01: elm_win: Set initial withdrawn state from win's ecore_evas property.
hermet pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=304899eed28addfdb59fc9f4c3b1d030d923726c commit 304899eed28addfdb59fc9f4c3b1d030d923726c Author: Jaehyun Cho jae_hyun@samsung.com Date: Tue May 19 21:32:10 2015 +0900 elm_win: Set initial withdrawn state from win's ecore_evas property. Summary: For instance, ecore_evas sets initial withdrawn state EINA_FALSE if elm_engine is buffer. Therefore, the initial withdrawn state is derived from ecore_evas property. @fix Reviewers: raster, Hermet Reviewed By: Hermet Differential Revision: https://phab.enlightenment.org/D2435 --- src/lib/elm_win.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index c243735..2c8ace3 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -3589,7 +3589,7 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_ sd-type = type; sd-parent = parent; sd-modal_count = 0; - sd-withdrawn = EINA_TRUE; + sd-withdrawn = ecore_evas_withdrawn_get(sd-ee); if (sd-parent) evas_object_event_callback_add --
[EGIT] [core/elementary] elementary-1.14 01/01: elm_win: Set initial withdrawn state from win's ecore_evas property.
hermet pushed a commit to branch elementary-1.14. http://git.enlightenment.org/core/elementary.git/commit/?id=8d9310116479bcbed0d30c5b1b35156d7081a0e8 commit 8d9310116479bcbed0d30c5b1b35156d7081a0e8 Author: Jaehyun Cho jae_hyun@samsung.com Date: Tue May 19 21:32:10 2015 +0900 elm_win: Set initial withdrawn state from win's ecore_evas property. Summary: For instance, ecore_evas sets initial withdrawn state EINA_FALSE if elm_engine is buffer. Therefore, the initial withdrawn state is derived from ecore_evas property. @fix Reviewers: raster, Hermet Reviewed By: Hermet Differential Revision: https://phab.enlightenment.org/D2435 --- src/lib/elm_win.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index 494db21..77e30cc 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -3488,7 +3488,7 @@ _elm_win_constructor(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_Type t sd-type = type; sd-parent = parent; sd-modal_count = 0; - sd-withdrawn = EINA_TRUE; + sd-withdrawn = ecore_evas_withdrawn_get(sd-ee); if (sd-parent) evas_object_event_callback_add --
[EGIT] [core/efl] master 03/05: evas: fix compatibility with GLES. Alpha test
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=fb2e28eec857558844d4cde18c3dcc14f377
commit fb2e28eec857558844d4cde18c3dcc14f377
Author: Oleksandr Shcherbina o.shcherb...@samsung.com
Date: Tue May 19 12:38:27 2015 +0200
evas: fix compatibility with GLES. Alpha test
Summary:
Add alpha test in shader code instead of function glAlphaFunc that doesn't
supported
in GLES2.0
Add gag and TODO in shader function that generate shadow. Without it all
scene is
shadowed, because shadow effect doesn't work yet.
Reviewers: cedric, Hermet
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2529
Signed-off-by: Cedric BAIL ced...@osg.samsung.com
---
.../evas/engines/gl_common/evas_gl_3d_shader.c | 13 -
.../gl_common/shader_3d/color_pick_frag.shd| 9 +++-
.../engines/gl_common/shader_3d/diffuse_frag.shd | 5 ++
.../evas/engines/gl_common/shader_3d/flat_frag.shd | 29 +++
.../evas/engines/gl_common/shader_3d/include.shd | 58 +-
.../gl_common/shader_3d/normal_map_frag.shd| 32 +++-
.../shader_3d/parallax_occlusion_frag.shd | 44 +---
.../engines/gl_common/shader_3d/phong_frag.shd | 32 +++-
.../gl_common/shader_3d/shadow_map_frag.shd| 13 +++--
.../gl_common/shader_3d/vertex_color_frag.shd | 7 +++
10 files changed, 179 insertions(+), 63 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_3d_shader.c
b/src/modules/evas/engines/gl_common/evas_gl_3d_shader.c
index 59d68a0..7c9b2fc 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_3d_shader.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_3d_shader.c
@@ -63,6 +63,8 @@ typedef enum _E3D_Uniform
E3D_UNIFORM_FOG_FACTOR,
E3D_UNIFORM_FOG_COLOR,
E3D_UNIFORM_COLOR_PICK,
+ E3D_UNIFORM_ALPHATEST_COMPARISON,
+ E3D_UNIFORM_ALPHATEST_REFVALUE,
E3D_UNIFORM_COUNT,
} E3D_Uniform;
@@ -350,7 +352,9 @@ static const char *uniform_names[] =
uMaterialShininess,
uFogFactor,
uFogColor,
- uColorPick
+ uColorPick,
+ uAlphaTestComparison,
+ uAlphaTestRefValue,
};
static inline void
@@ -579,6 +583,13 @@ _uniform_upload(E3D_Uniform u, GLint loc, const
E3D_Draw_Data *data)
case E3D_UNIFORM_COLOR_PICK:
glUniform1f(loc, data-color_pick_key);
break;
+ case E3D_UNIFORM_ALPHATEST_COMPARISON:
+ glUniform1i(loc,
+(data-alpha_comparison ? data-alpha_comparison :
EVAS_3D_COMPARISON_GREATER));
+ break;
+ case E3D_UNIFORM_ALPHATEST_REFVALUE:
+ glUniform1f(loc, (data-alpha_ref_value ? data-alpha_ref_value :
0.0));
+ break;
default:
ERR(Invalid uniform ID.);
break;
diff --git a/src/modules/evas/engines/gl_common/shader_3d/color_pick_frag.shd
b/src/modules/evas/engines/gl_common/shader_3d/color_pick_frag.shd
index 5e0fc6c..071f60e 100644
--- a/src/modules/evas/engines/gl_common/shader_3d/color_pick_frag.shd
+++ b/src/modules/evas/engines/gl_common/shader_3d/color_pick_frag.shd
@@ -1,7 +1,14 @@
uniform float uColorPick;
+FRAGMENT_SHADER_USE_ALPHA_TEST_GLES
void main()
{
- gl_FragColor = vec4(uColorPick);
+ vec4 color = vec4(uColorPick);
+
+#ifdef ALPHA_TEST_ENABLED
+ FRAGMENT_SHADER_ALPHA_TEST_GLES_APPLY(color)
+#else
+ gl_FragColor = color;
+#endif //ALPHA_TEST_ENABLED
}
diff --git a/src/modules/evas/engines/gl_common/shader_3d/diffuse_frag.shd
b/src/modules/evas/engines/gl_common/shader_3d/diffuse_frag.shd
index b08bf40..9faa357 100644
--- a/src/modules/evas/engines/gl_common/shader_3d/diffuse_frag.shd
+++ b/src/modules/evas/engines/gl_common/shader_3d/diffuse_frag.shd
@@ -1,11 +1,16 @@
FRAGMENT_SHADER_USE_TEX_COORD
FRAGMENT_SHADER_USE_FOG
FRAGMENT_SHADER_USE_DIFFUSE_TERM
+FRAGMENT_SHADER_USE_ALPHA_TEST_GLES
void main() {
vec4 color;
FRAGMENT_SHADER_TEXTURE_BLEND(DIFFUSE, Diffuse)
+#ifdef ALPHA_TEST_ENABLED
+ FRAGMENT_SHADER_ALPHA_TEST_GLES_APPLY(color)
+#else
gl_FragColor = color;
+#endif //ALPHA_TEST_ENABLED
FRAGMENT_SHADER_FOG_APPLY
}
diff --git a/src/modules/evas/engines/gl_common/shader_3d/flat_frag.shd
b/src/modules/evas/engines/gl_common/shader_3d/flat_frag.shd
index 38d9790..7814f9a 100644
--- a/src/modules/evas/engines/gl_common/shader_3d/flat_frag.shd
+++ b/src/modules/evas/engines/gl_common/shader_3d/flat_frag.shd
@@ -7,51 +7,58 @@ FRAGMENT_SHADER_USE_DIFFUSE_TERM
FRAGMENT_SHADER_USE_SPECULAR_TERM
FRAGMENT_SHADER_USE_AMBIENT_TERM
FRAGMENT_SHADER_USE_EMISSION_TERM
+FRAGMENT_SHADER_USE_ALPHA_TEST_GLES
-void fragmentFlat()
+vec4 fragmentFlat()
{
vec4 color;
-
+ vec4 fragcolor;
#ifdef DIFFUSE
FRAGMENT_SHADER_TEXTURE_BLEND(DIFFUSE, Diffuse)
- gl_FragColor = uLightDiffuse * color * vFactor.x;
+ fragcolor = uLightDiffuse * color * vFactor.x;
#else
- gl_FragColor = vec4(0.0, 0.0, 0.0, 0.0);
+
[EGIT] [core/efl] master 04/05: edje: switch Evas_3D color to use Edje_Color.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d7a53b11f620568a1f374f34a4c24db6a57f6afa
commit d7a53b11f620568a1f374f34a4c24db6a57f6afa
Author: perepelits.m perepelit...@samsung.com
Date: Tue May 19 12:39:05 2015 +0200
edje: switch Evas_3D color to use Edje_Color.
Summary: Changes float on uchar as we do in other place for color component
Reviewers: raster, Hermet, cedric
Reviewed By: cedric
Subscribers: cedric, artem.popov
Differential Revision: https://phab.enlightenment.org/D2528
Signed-off-by: Cedric BAIL ced...@osg.samsung.com
---
src/bin/edje/edje_cc_handlers.c | 32
src/lib/edje/edje_private.h | 18 ++
2 files changed, 22 insertions(+), 28 deletions(-)
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index 21751d3..5b5d233 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -9561,10 +9561,10 @@
st_collections_group_parts_part_description_properties_ambient(void)
ed = (Edje_Part_Description_Light*) current_desc;
- ed-light.properties.ambient.r = parse_float_range(0, 0.0, 1.0);
- ed-light.properties.ambient.g = parse_float_range(1, 0.0, 1.0);
- ed-light.properties.ambient.b = parse_float_range(2, 0.0, 1.0);
- ed-light.properties.ambient.a = parse_float_range(3, 0.0, 1.0);
+ ed-light.properties.ambient.r = parse_int_range(0, 0, 255);
+ ed-light.properties.ambient.g = parse_int_range(1, 0, 255);
+ ed-light.properties.ambient.b = parse_int_range(2, 0, 255);
+ ed-light.properties.ambient.a = parse_int_range(3, 0, 255);
break;
}
case EDJE_PART_TYPE_MESH_NODE:
@@ -9573,10 +9573,10 @@
st_collections_group_parts_part_description_properties_ambient(void)
ed = (Edje_Part_Description_Mesh_Node*) current_desc;
- ed-mesh_node.properties.ambient.r = parse_float_range(0, 0.0, 1.0);
- ed-mesh_node.properties.ambient.g = parse_float_range(1, 0.0, 1.0);
- ed-mesh_node.properties.ambient.b = parse_float_range(2, 0.0, 1.0);
- ed-mesh_node.properties.ambient.a = parse_float_range(3, 0.0, 1.0);
+ ed-mesh_node.properties.ambient.r = parse_int_range(0, 0, 255);
+ ed-mesh_node.properties.ambient.g = parse_int_range(1, 0, 255);
+ ed-mesh_node.properties.ambient.b = parse_int_range(2, 0, 255);
+ ed-mesh_node.properties.ambient.a = parse_int_range(3, 0, 255);
break;
}
default:
@@ -9611,10 +9611,10 @@
st_collections_group_parts_part_description_properties_diffuse(void)
ed = (Edje_Part_Description_Light*) current_desc;
- ed-light.properties.diffuse.r = parse_float_range(0, 0.0, 1.0);
- ed-light.properties.diffuse.g = parse_float_range(1, 0.0, 1.0);
- ed-light.properties.diffuse.b = parse_float_range(2, 0.0, 1.0);
- ed-light.properties.diffuse.a = parse_float_range(3, 0.0, 1.0);
+ ed-light.properties.diffuse.r = parse_int_range(0, 0, 255);
+ ed-light.properties.diffuse.g = parse_int_range(1, 0, 255);
+ ed-light.properties.diffuse.b = parse_int_range(2, 0, 255);
+ ed-light.properties.diffuse.a = parse_int_range(3, 0, 255);
break;
}
case EDJE_PART_TYPE_MESH_NODE:
@@ -9623,10 +9623,10 @@
st_collections_group_parts_part_description_properties_diffuse(void)
ed = (Edje_Part_Description_Mesh_Node*) current_desc;
- ed-mesh_node.properties.diffuse.r = parse_float_range(0, 0.0, 1.0);
- ed-mesh_node.properties.diffuse.g = parse_float_range(1, 0.0, 1.0);
- ed-mesh_node.properties.diffuse.b = parse_float_range(2, 0.0, 1.0);
- ed-mesh_node.properties.diffuse.a = parse_float_range(3, 0.0, 1.0);
+ ed-mesh_node.properties.diffuse.r = parse_int_range(0, 0, 255);
+ ed-mesh_node.properties.diffuse.g = parse_int_range(1, 0, 255);
+ ed-mesh_node.properties.diffuse.b = parse_int_range(2, 0, 255);
+ ed-mesh_node.properties.diffuse.a = parse_int_range(3, 0, 255);
break;
}
default:
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index d3e120c..e5507e4 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -253,11 +253,6 @@ struct _Edje_Color
unsigned char r, g, b, a;
};
-struct _Edje_Float_Color
-{
- FLOAT_T r, g, b, a;
-};
-
struct _Edje_Map_Color
{
int idx;
@@ -304,7 +299,6 @@ typedef struct _Edje_Position
Edje_Position;
typedef struct _Edje_SizeEdje_Size;
typedef struct _Edje_Rectangle Edje_Rectangle;
typedef struct _Edje_Color Edje_Color;
-typedef struct _Edje_Float_Color
[EGIT] [core/elementary] elementary-1.14 01/02: Merge branch 'elementary-1.14' of git+ssh://git.enlightenment.org/core/elementary into elementary-1.14
hermet pushed a commit to branch elementary-1.14. http://git.enlightenment.org/core/elementary.git/commit/?id=943312bcec14d53edd43565ab871d59e3244273f commit 943312bcec14d53edd43565ab871d59e3244273f Merge: 304899e d5e0d00 Author: ChunEon Park her...@hermet.pe.kr Date: Tue May 19 21:52:39 2015 +0900 Merge branch 'elementary-1.14' of git+ssh://git.enlightenment.org/core/elementary into elementary-1.14 src/lib/elm_toolbar.c | 8 +--- 1 file changed, 1 insertion(+), 7 deletions(-) --
[EGIT] [core/efl] master 01/01: eolian: cleaner cyclic import checks
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=30515bc946622dcc03322916184f36003e40b062
commit 30515bc946622dcc03322916184f36003e40b062
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Tue May 19 15:44:33 2015 +0100
eolian: cleaner cyclic import checks
---
src/lib/eolian/database_fill.c | 8 +++-
src/lib/eolian/eo_parser.c | 10 --
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/lib/eolian/database_fill.c b/src/lib/eolian/database_fill.c
index 00dd224..58eaace 100644
--- a/src/lib/eolian/database_fill.c
+++ b/src/lib/eolian/database_fill.c
@@ -218,6 +218,8 @@ eo_parser_database_fill(const char *filename, Eina_Bool eot)
if (eot eina_hash_find(_parsedeots, filename))
return EINA_TRUE;
+ if (eot) eina_hash_set(_parsingeots, filename, (void *)EINA_TRUE);
+
ls = eo_lexer_new(filename);
if (!ls)
{
@@ -254,12 +256,16 @@ eo_parser_database_fill(const char *filename, Eina_Bool
eot)
done:
if (eot)
- eina_hash_set(_parsedeots, filename, (void *)EINA_TRUE);
+ {
+eina_hash_set(_parsedeots, filename, (void *)EINA_TRUE);
+eina_hash_set(_parsingeots, filename, (void *)EINA_FALSE);
+ }
eo_lexer_free(ls);
return EINA_TRUE;
error:
+ if (eot) eina_hash_set(_parsingeots, filename, (void *)EINA_FALSE);
eo_lexer_free(ls);
return EINA_FALSE;
}
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index 30b1ced..774bf14 100644
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -1798,22 +1798,21 @@ parse_unit(Eo_Lexer *ls, Eina_Bool eot)
check(ls, TOK_VALUE);
eina_strbuf_append(buf, ls-t.value.s);
eina_strbuf_append(buf, .eot);
- if (eina_hash_find(_parsingeots, ls-t.value.s))
+ if (!(found = eina_hash_find(_tfilenames,
eina_strbuf_string_get(buf
{
pop_strbuf(ls);
snprintf(errbuf, sizeof(errbuf),
- cyclic import '%s', ls-t.value.s);
+ unknown import '%s', ls-t.value.s);
eo_lexer_syntax_error(ls, errbuf);
}
- if (!(found = eina_hash_find(_tfilenames,
eina_strbuf_string_get(buf
+ if (eina_hash_find(_parsingeots, found))
{
pop_strbuf(ls);
snprintf(errbuf, sizeof(errbuf),
- unknown import '%s', ls-t.value.s);
+ cyclic import '%s', ls-t.value.s);
eo_lexer_syntax_error(ls, errbuf);
}
pop_strbuf(ls);
- eina_hash_set(_parsingeots, ls-t.value.s, (void *)EINA_TRUE);
if (!eo_parser_database_fill(found, EINA_TRUE))
{
pop_strbuf(ls);
@@ -1821,7 +1820,6 @@ parse_unit(Eo_Lexer *ls, Eina_Bool eot)
error while parsing import '%s', ls-t.value.s);
eo_lexer_syntax_error(ls, errbuf);
}
- eina_hash_set(_parsingeots, ls-t.value.s, (void *)EINA_FALSE);
pop_strbuf(ls);
eo_lexer_get(ls);
check_next(ls, ';');
--
[EGIT] [core/efl] master 01/01: eolian: add a functional import statement
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=72dcd2da03b9c49d53429f781e10f81110a07a8c
commit 72dcd2da03b9c49d53429f781e10f81110a07a8c
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Tue May 19 15:26:53 2015 +0100
eolian: add a functional import statement
---
src/bin/eolian/main.c| 2 --
src/lib/eolian/database_fill.c | 9 -
src/lib/eolian/eo_lexer.c| 2 +-
src/lib/eolian/eo_parser.c | 33 -
src/lib/eolian/eolian_database.c | 7 +++
src/lib/eolian/eolian_database.h | 4
6 files changed, 52 insertions(+), 5 deletions(-)
diff --git a/src/bin/eolian/main.c b/src/bin/eolian/main.c
index 091a383..e45d2a7 100644
--- a/src/bin/eolian/main.c
+++ b/src/bin/eolian/main.c
@@ -391,8 +391,6 @@ int main(int argc, char **argv)
goto end;
}
- eolian_all_eot_files_parse();
-
if (!eolian_eo_file_parse(eo_filename))
{
ERR(Error during parsing file %s\n, eo_filename);
diff --git a/src/lib/eolian/database_fill.c b/src/lib/eolian/database_fill.c
index f019f99..00dd224 100644
--- a/src/lib/eolian/database_fill.c
+++ b/src/lib/eolian/database_fill.c
@@ -213,8 +213,12 @@ Eina_Bool
eo_parser_database_fill(const char *filename, Eina_Bool eot)
{
Eolian_Class *cl;
+ Eo_Lexer *ls;
- Eo_Lexer *ls = eo_lexer_new(filename);
+ if (eot eina_hash_find(_parsedeots, filename))
+ return EINA_TRUE;
+
+ ls = eo_lexer_new(filename);
if (!ls)
{
fprintf(stderr, eolian: unable to create lexer for file '%s'\n,
filename);
@@ -249,6 +253,9 @@ eo_parser_database_fill(const char *filename, Eina_Bool eot)
}
done:
+ if (eot)
+ eina_hash_set(_parsedeots, filename, (void *)EINA_TRUE);
+
eo_lexer_free(ls);
return EINA_TRUE;
diff --git a/src/lib/eolian/eo_lexer.c b/src/lib/eolian/eo_lexer.c
index 32787f1..c84df4b 100644
--- a/src/lib/eolian/eo_lexer.c
+++ b/src/lib/eolian/eo_lexer.c
@@ -659,7 +659,7 @@ eo_lexer_set_input(Eo_Lexer *ls, const char *source)
ls-source = eina_stringshare_add(source);
ls-filename= get_filename(ls);
ls-line_number = 1;
- ls-icolumn = ls-column = 0;
+ ls-icolumn = ls-column = -1;
next_char(ls);
if (ls-current != 0xEF)
return;
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index 24089aa..30b1ced 100644
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -1791,8 +1791,39 @@ parse_unit(Eo_Lexer *ls, Eina_Bool eot)
goto found_class;
case KW_import:
{
+ Eina_Strbuf *buf = push_strbuf(ls);
+ const char *found = NULL;
+ char errbuf[PATH_MAX];
+ eo_lexer_get(ls);
+ check(ls, TOK_VALUE);
+ eina_strbuf_append(buf, ls-t.value.s);
+ eina_strbuf_append(buf, .eot);
+ if (eina_hash_find(_parsingeots, ls-t.value.s))
+ {
+pop_strbuf(ls);
+snprintf(errbuf, sizeof(errbuf),
+ cyclic import '%s', ls-t.value.s);
+eo_lexer_syntax_error(ls, errbuf);
+ }
+ if (!(found = eina_hash_find(_tfilenames,
eina_strbuf_string_get(buf
+ {
+pop_strbuf(ls);
+snprintf(errbuf, sizeof(errbuf),
+ unknown import '%s', ls-t.value.s);
+eo_lexer_syntax_error(ls, errbuf);
+ }
+ pop_strbuf(ls);
+ eina_hash_set(_parsingeots, ls-t.value.s, (void *)EINA_TRUE);
+ if (!eo_parser_database_fill(found, EINA_TRUE))
+ {
+pop_strbuf(ls);
+snprintf(errbuf, sizeof(errbuf),
+ error while parsing import '%s', ls-t.value.s);
+eo_lexer_syntax_error(ls, errbuf);
+ }
+ eina_hash_set(_parsingeots, ls-t.value.s, (void *)EINA_FALSE);
+ pop_strbuf(ls);
eo_lexer_get(ls);
- check_next(ls, TOK_VALUE);
check_next(ls, ';');
break;
}
diff --git a/src/lib/eolian/eolian_database.c b/src/lib/eolian/eolian_database.c
index 615c774..9e71ec0 100644
--- a/src/lib/eolian/eolian_database.c
+++ b/src/lib/eolian/eolian_database.c
@@ -24,6 +24,9 @@ Eina_Hash *_tfilenames = NULL;
Eina_Hash *_depclasses = NULL;
Eina_Hash *_decls = NULL;
+Eina_Hash *_parsedeots = NULL;
+Eina_Hash *_parsingeots = NULL;
+
static int _database_init_count = 0;
static void
@@ -66,6 +69,8 @@ database_init()
_tfilenames = eina_hash_string_small_new(free);
_depclasses = eina_hash_stringshared_new(EINA_FREE_CB(_deplist_free));
_decls = eina_hash_stringshared_new(free);
+ _parsedeots = eina_hash_string_small_new(NULL);
+ _parsingeots = eina_hash_string_small_new(NULL);
return ++_database_init_count;
}
@@ -97,6 +102,8 @@ database_shutdown()
[EGIT] [core/efl] master 01/01: eolian: tests for import
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b647448f84309d53eb4d71d909d436b0bb4c7894
commit b647448f84309d53eb4d71d909d436b0bb4c7894
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Tue May 19 15:38:31 2015 +0100
eolian: tests for import
---
src/Makefile_Eolian.am | 4 +++-
src/tests/eolian/data/import.eo| 8
src/tests/eolian/data/import_types.eot | 5 +
src/tests/eolian/eolian_parsing.c | 23 +++
4 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/src/Makefile_Eolian.am b/src/Makefile_Eolian.am
index 0f3f4a3..1394b2e 100644
--- a/src/Makefile_Eolian.am
+++ b/src/Makefile_Eolian.am
@@ -93,7 +93,9 @@ tests/eolian/data/nmsp1_class1.eo \
tests/eolian/data/nmsp1_nmsp11_class2.eo \
tests/eolian/data/nmsp2_class1.eo \
tests/eolian/data/null.eo \
-tests/eolian/data/no_nmsp.eo
+tests/eolian/data/no_nmsp.eo \
+tests/eolian/data/import.eo \
+tests/eolian/data/import_types.eot
EOLIAN_TESTS_EOS_GENERATED = \
$(EOLIAN_TESTS_EOS:%.eo=%.eo.c)\
diff --git a/src/tests/eolian/data/import.eo b/src/tests/eolian/data/import.eo
new file mode 100644
index 000..8948424
--- /dev/null
+++ b/src/tests/eolian/data/import.eo
@@ -0,0 +1,8 @@
+import import_types;
+
+class Import {
+ methods {
+ foo {
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/tests/eolian/data/import_types.eot
b/src/tests/eolian/data/import_types.eot
new file mode 100644
index 000..bb81745
--- /dev/null
+++ b/src/tests/eolian/data/import_types.eot
@@ -0,0 +1,5 @@
+type Imported: int;
+
+struct Imported_Struct {
+foo: float;
+}
\ No newline at end of file
diff --git a/src/tests/eolian/eolian_parsing.c
b/src/tests/eolian/eolian_parsing.c
index 41c4152..c4745cc 100644
--- a/src/tests/eolian/eolian_parsing.c
+++ b/src/tests/eolian/eolian_parsing.c
@@ -1046,6 +1046,28 @@ START_TEST(eolian_null)
}
END_TEST
+START_TEST(eolian_import)
+{
+ const Eolian_Class *class;
+ const Eolian_Type *type;
+
+ eolian_init();
+
+ fail_if(!eolian_directory_scan(PACKAGE_DATA_DIR/data));
+
+ fail_if(!eolian_eo_file_parse(PACKAGE_DATA_DIR/data/import.eo));
+ fail_if(!(class = eolian_class_get_by_name(Import)));
+
+ fail_if(!(type = eolian_type_alias_get_by_name(Imported)));
+ fail_if(strcmp(eolian_type_file_get(type), import_types.eot));
+
+ fail_if(!(type = eolian_type_struct_get_by_name(Imported_Struct)));
+ fail_if(strcmp(eolian_type_file_get(type), import_types.eot));
+
+ eolian_shutdown();
+}
+END_TEST
+
void eolian_parsing_test(TCase *tc)
{
tcase_add_test(tc, eolian_simple_parsing);
@@ -1064,5 +1086,6 @@ void eolian_parsing_test(TCase *tc)
tcase_add_test(tc, eolian_class_funcs);
tcase_add_test(tc, eolian_free_func);
tcase_add_test(tc, eolian_null);
+ tcase_add_test(tc, eolian_import);
}
--
[EGIT] [core/efl] master 01/01: eolian: use data_type consistently in the C generator
q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=1b47e2e0133623d0a22342e9fbdad57b3c4fb484 commit 1b47e2e0133623d0a22342e9fbdad57b3c4fb484 Author: Daniel Kolesa d.kol...@osg.samsung.com Date: Tue May 19 17:46:11 2015 +0100 eolian: use data_type consistently in the C generator This change makes it use full class name everywhere (instead of just class name). @fix --- src/bin/eolian/impl_generator.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/bin/eolian/impl_generator.c b/src/bin/eolian/impl_generator.c index 3c0864d..75f1266 100644 --- a/src/bin/eolian/impl_generator.c +++ b/src/bin/eolian/impl_generator.c @@ -216,7 +216,6 @@ impl_source_generate(const Eolian_Class *class, Eina_Strbuf *buffer) Eina_Iterator *itr; const Eolian_Function *foo; Eina_Strbuf *begin = eina_strbuf_new(); - const char *class_name = eolian_class_name_get(class); char core_incl[PATH_MAX]; _class_env_create(class, NULL, class_env); @@ -241,7 +240,7 @@ impl_source_generate(const Eolian_Class *class, Eina_Strbuf *buffer) eina_strbuf_append_printf(data_type_buf, %s, data_type); } else - eina_strbuf_append_printf(data_type_buf, %s_Data, class_name); + eina_strbuf_append_printf(data_type_buf, %s_Data, class_env.full_classname); /* Definition of the structure */ const char *data_type_str = eina_strbuf_string_get(data_type_buf); --
[EGIT] [core/elementary] master 01/01: entry: update selection handlers when entry is resized
hermet pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=4c35ee470ea3bd17b21d608d715733a0619bb95c commit 4c35ee470ea3bd17b21d608d715733a0619bb95c Author: Thiep Ha thie...@gmail.com Date: Tue May 19 21:13:55 2015 +0900 entry: update selection handlers when entry is resized Summary: When entry is resized, selection handlers are not updated, it causes selection handlers to be placed in wrong position. This patch fixes it. @fix Reviewers: woohyun, seoz, herdsman, Hermet Reviewed By: Hermet Differential Revision: https://phab.enlightenment.org/D2487 --- src/lib/elm_entry.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c index c39b212..23ce545 100644 --- a/src/lib/elm_entry.c +++ b/src/lib/elm_entry.c @@ -3647,7 +3647,8 @@ _elm_entry_evas_object_smart_resize(Eo *obj, Elm_Entry_Data *sd, Evas_Coord w, E eo_do_super(obj, MY_CLASS, evas_obj_smart_resize(w, h)); evas_object_resize(sd-hit_rect, w, h); - + if (sd-have_selection) + _update_selection_handler(obj); } EOLIAN static void --
[EGIT] [core/efl] master 01/05: eina: print error message when eina_module_load() fails.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b9cd26c906970d3ccdd7508e2a903a89ef5c630e
commit b9cd26c906970d3ccdd7508e2a903a89ef5c630e
Author: Youngbok Shin youngb.s...@samsung.com
Date: Tue May 19 12:36:46 2015 +0200
eina: print error message when eina_module_load() fails.
Summary:
When dlopen() fails, eina_module_load() print error information using
dlerror().
But, it is printed with WRN. If EINA_LOG_LEVEL is lower than WRN,
application developer is hard to see which has a problem.
Reviewers: woohyun, Hermet, raster, cedric
Reviewed By: cedric
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2536
Signed-off-by: Cedric BAIL ced...@osg.samsung.com
---
src/lib/eina/eina_module.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/eina/eina_module.c b/src/lib/eina/eina_module.c
index fbdeeeb..65c18ab 100644
--- a/src/lib/eina/eina_module.c
+++ b/src/lib/eina/eina_module.c
@@ -325,7 +325,7 @@ EAPI Eina_Bool eina_module_load(Eina_Module *m)
if (!dl_handle)
{
-WRN(could not dlopen(\%s\, %s): %s, m-file, dlerror(),
+ERR(could not dlopen(\%s\, %s): %s, m-file, dlerror(),
(flag == RTLD_NOW) ? RTLD_NOW : RTLD_LAZY);
return EINA_FALSE;
}
@@ -337,7 +337,7 @@ EAPI Eina_Bool eina_module_load(Eina_Module *m)
if ((*initcall)() == EINA_TRUE)
goto ok;
- WRN(could not find eina's entry symbol %s inside module %s, or the init
function failed,
+ ERR(could not find eina's entry symbol %s inside module %s, or the init
function failed,
EINA_MODULE_SYMBOL_INIT, m-file);
dlclose(dl_handle);
return EINA_FALSE;
--
[EGIT] [core/efl] master 02/05: edje: add cubic bezier transition example.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=acc481336587e362e095e61702078289bd978dcd
commit acc481336587e362e095e61702078289bd978dcd
Author: kumar navneet k.navn...@samsung.com
Date: Tue May 19 12:37:13 2015 +0200
edje: add cubic bezier transition example.
Summary:
Example was missing for cubic bezier transition, hence added the same.
Signed-Off By: Shilpa Singh shilpa.si...@samsung.com
Test Plan: bezier-transition-example.edc added
Reviewers: shilpasingh, cedric
Subscribers: poornima.srinivasan, cedric
Differential Revision: https://phab.enlightenment.org/D2533
Signed-off-by: Cedric BAIL ced...@osg.samsung.com
---
src/examples/edje/Makefile.am | 4 +-
src/examples/edje/bezier-transition-example.edc | 52 +
2 files changed, 55 insertions(+), 1 deletion(-)
diff --git a/src/examples/edje/Makefile.am b/src/examples/edje/Makefile.am
index 6b8e3cb..cdf1ac3 100644
--- a/src/examples/edje/Makefile.am
+++ b/src/examples/edje/Makefile.am
@@ -47,7 +47,9 @@ table.edc \
text.edc \
toggle_using_filter.edc \
box_example.edc \
-embryo_tween_anim.edc
+embryo_tween_anim.edc \
+embryo_set_state_anim.edc \
+bezier-transition-example.edc
DIST_EDCS = $(EDCS)
diff --git a/src/examples/edje/bezier-transition-example.edc
b/src/examples/edje/bezier-transition-example.edc
new file mode 100644
index 000..b07fc28
--- /dev/null
+++ b/src/examples/edje/bezier-transition-example.edc
@@ -0,0 +1,52 @@
+collections {
+ group { name: main;
+ script{
+public test(val, Float:pos)
+ {
+ set_state_anim(PART:red_rect, default, 1.0, CUBIC_BEZIER,
pos, 0.27, 1.29, 1, -0.25);
+ }
+ }
+ parts {
+ part { name: bg;
+type: RECT;
+description { state: default 0.0;
+ color: 255 255 255 255;
+}
+ }
+ part { name: label;
+type: TEXT;
+description { state: default 0.0;
+ color: 0 0 0 255;
+ text {
+ text: Click me.;
+ font: Sans;
+ size: 12;
+ align: 0.0 0.7;
+ }
+}
+ }
+ part { name: red_rect;
+type: RECT;
+description { state: default 0.0;
+ color: 0 0 255 255;
+ max: 30 30;
+ align: 0.1 0.2;
+}
+description { state: default 1.0;
+ inherit: default 0.0;
+ color: 0 0 255 255;
+ align: 0.9 0.2;
+}
+ }
+ }
+ programs {
+ program {
+signal: mouse,down,1;
+source: label;
+script {
+ anim(5.5, test, 1);
+}
+ }
+ }
+ }
+}
--
[EGIT] [core/efl] master 05/05: eina: add tests cases for eina_rectangle and eina_str functions
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6c33bbfa807e3935ba36d9956c24fd8a93d928fa
commit 6c33bbfa807e3935ba36d9956c24fd8a93d928fa
Author: Vivek Ellur vivek.el...@samsung.com
Date: Tue May 19 14:13:17 2015 +0200
eina: add tests cases for eina_rectangle and eina_str functions
Summary:
Added test cases for eina_rectangle_union and eina_streq functions
Signed-off-by: Vivek Ellur vivek.el...@samsung.com
Reviewers: cedric
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2541
Signed-off-by: Cedric BAIL ced...@osg.samsung.com
---
src/tests/eina/eina_test_rectangle.c | 36 +---
src/tests/eina/eina_test_str.c | 7 +++
2 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/src/tests/eina/eina_test_rectangle.c
b/src/tests/eina/eina_test_rectangle.c
index e5a211f..089b68b 100644
--- a/src/tests/eina/eina_test_rectangle.c
+++ b/src/tests/eina/eina_test_rectangle.c
@@ -72,9 +72,9 @@ START_TEST(eina_rectangle_pool)
}
END_TEST
-START_TEST(eina_rectangle_intersect)
+START_TEST(eina_rectangle_union_intersect)
{
- Eina_Rectangle r1, r2, r3, r4, rd;
+ Eina_Rectangle r1, r2, r3, r4, r5, r6, rd;
fail_if(!eina_init());
@@ -82,6 +82,8 @@ START_TEST(eina_rectangle_intersect)
EINA_RECTANGLE_SET(r2, 20, 20, 20, 20);
EINA_RECTANGLE_SET(r3, 0, 0, 10, 10);
EINA_RECTANGLE_SET(r4, 30, 30, 50, 50);
+ EINA_RECTANGLE_SET(r5, 10, 10, 0, 0);
+ EINA_RECTANGLE_SET(r6, 30, 30, 0, 0);
rd = r1;
@@ -102,6 +104,34 @@ START_TEST(eina_rectangle_intersect)
|| rd.w != 30
|| rd.h != 30);
+ rd = r1;
+ eina_rectangle_union(rd, r2);
+ fail_if(rd.x != r1.x
+ || rd.y != r1.y
+ || rd.w != r1.w
+ || rd.h != r1.h);
+
+ rd = r1;
+ eina_rectangle_union(rd, r3);
+ fail_if(rd.x != 0
+ || rd.y != 0
+ || rd.w != 60
+ || rd.h != 60);
+
+ rd = r3;
+ eina_rectangle_union(rd, r4);
+ fail_if(rd.x != 0
+ || rd.y != 0
+ || rd.w != 80
+ || rd.h != 80);
+
+ rd = r5;
+ eina_rectangle_union(rd, r6);
+ fail_if(rd.x != 10
+ || rd.y != 10
+ || rd.w != 20
+ || rd.h != 20);
+
eina_shutdown();
}
END_TEST
@@ -110,6 +140,6 @@ void
eina_test_rectangle(TCase *tc)
{
tcase_add_test(tc, eina_rectangle_pool);
- tcase_add_test(tc, eina_rectangle_intersect);
+ tcase_add_test(tc, eina_rectangle_union_intersect);
}
diff --git a/src/tests/eina/eina_test_str.c b/src/tests/eina/eina_test_str.c
index be879db..8233dd8 100644
--- a/src/tests/eina/eina_test_str.c
+++ b/src/tests/eina/eina_test_str.c
@@ -80,6 +80,13 @@
fail_if(eina_str_has_extension(xab, xYz));
fail_if(eina_str_has_extension(, x));
+ fail_if(eina_streq(xab, NULL));
+ fail_if(eina_streq(NULL, xab));
+ fail_if(eina_streq(x, xab));
+ fail_if(eina_streq(xab, XAB));
+ fail_if(eina_streq(x, x ));
+ fail_if(!eina_streq(xab, xab));
+
fail_if(eina_strlen_bounded(abc, 1024) != strlen(abc));
fail_if(eina_strlen_bounded(abc, 2) != (size_t)-1);
--
[EGIT] [tools/edi] master 01/02: Create helper for opening URLs
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=f1d55e70e8b7c23f5c1cca7b8a869dfe76a82f51
commit f1d55e70e8b7c23f5c1cca7b8a869dfe76a82f51
Author: Andy Williams a...@andywilliams.me
Date: Tue May 19 22:28:05 2015 +0100
Create helper for opening URLs
---
src/bin/edi_main.c | 15 +++
src/bin/edi_private.h | 2 ++
src/bin/screens/edi_about.c | 12 +---
3 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/src/bin/edi_main.c b/src/bin/edi_main.c
index 18c1451..24322ad 100644
--- a/src/bin/edi_main.c
+++ b/src/bin/edi_main.c
@@ -909,6 +909,21 @@ edi_close()
elm_exit();
}
+void
+edi_open_url(const char *url)
+{
+ const char *format;
+ char *cmd;
+
+ format = xdg-open \%s\;
+
+ cmd = malloc(sizeof(char) * (strlen(format) + strlen(url) - 1));
+ sprintf(cmd, format, url);
+ ecore_exe_run(cmd, NULL);
+
+ free(cmd);
+}
+
static Eina_Bool
_edi_log_init()
{
diff --git a/src/bin/edi_private.h b/src/bin/edi_private.h
index 294a520..e6b3ddf 100644
--- a/src/bin/edi_private.h
+++ b/src/bin/edi_private.h
@@ -33,6 +33,8 @@ Evas_Object *edi_open(const char *path);
void edi_close();
+void edi_open_url();
+
// TODO remove this once our filepanel is updating gracefully
void _edi_filepanel_reload();
diff --git a/src/bin/screens/edi_about.c b/src/bin/screens/edi_about.c
index addbbe8..3337bea 100644
--- a/src/bin/screens/edi_about.c
+++ b/src/bin/screens/edi_about.c
@@ -16,17 +16,7 @@ _edi_about_exit(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_
static void
_edi_about_url_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
{
- const char *url, *format;
- char *cmd;
-
- url = (const char *)data;
- format = xdg-open \%s\;
-
- cmd = malloc(sizeof(char) * (strlen(format) + strlen(url) - 1));
- sprintf(cmd, format, url);
- ecore_exe_run(cmd, NULL);
-
- free(cmd);
+ edi_open_url((const char *)data);
}
Evas_Object *
--
[EGIT] [tools/edi] master 02/02: menu: flesh out our application menu
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=ff7d8550e5048488403c33415183ead5dae3ab00
commit ff7d8550e5048488403c33415183ead5dae3ab00
Author: Andy Williams a...@andywilliams.me
Date: Tue May 19 22:32:55 2015 +0100
menu: flesh out our application menu
---
TODO | 1 -
src/bin/edi_main.c | 146 +
2 files changed, 124 insertions(+), 23 deletions(-)
diff --git a/TODO b/TODO
index f212bc1..2f72d1c 100644
--- a/TODO
+++ b/TODO
@@ -2,7 +2,6 @@ This project is in heavy development, we are currenty working
towards the
Code aware editor phase, the following work is still to be done:
* Redo changes that have been undone
-* Add a menu for easier access to some features
* Search / replace in project / directory
* Integrate elm_code project (cedric, ajwillia-ms and TAsn)
- Code folding
diff --git a/src/bin/edi_main.c b/src/bin/edi_main.c
index 24322ad..a22788d 100644
--- a/src/bin/edi_main.c
+++ b/src/bin/edi_main.c
@@ -510,13 +510,6 @@ _tb_save_cb(void *data EINA_UNUSED, Evas_Object *obj, void
*event_info EINA_UNUS
}
static void
-_tb_open_window_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info
EINA_UNUSED)
-{
- elm_toolbar_item_selected_set(elm_toolbar_selected_item_get(obj),
EINA_FALSE);
- edi_mainview_new_window();
-}
-
-static void
_tb_close_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info
EINA_UNUSED)
{
elm_toolbar_item_selected_set(elm_toolbar_selected_item_get(obj),
EINA_FALSE);
@@ -573,12 +566,10 @@ _tb_goto_cancel_cb(void *data EINA_UNUSED,
}
static void
-_tb_goto_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info
EINA_UNUSED)
+_edi_edit_goto()
{
Evas_Object *popup, *input, *button;
- elm_toolbar_item_selected_set(elm_toolbar_selected_item_get(obj),
EINA_FALSE);
-
popup = elm_popup_add(_edi_main_win);
_edi_goto_popup = popup;
elm_object_part_text_set(popup, title,text,
@@ -603,6 +594,14 @@ _tb_goto_cb(void *data EINA_UNUSED, Evas_Object *obj, void
*event_info EINA_UNUS
evas_object_show(popup);
}
+static void
+_tb_goto_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info
EINA_UNUSED)
+{
+ elm_toolbar_item_selected_set(elm_toolbar_selected_item_get(obj),
EINA_FALSE);
+
+ _edi_edit_goto();
+}
+
static Eina_Bool
_edi_build_prep(Evas_Object *button, Eina_Bool test)
{
@@ -665,33 +664,117 @@ _tb_settings_cb(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *even
static void
_edi_menu_new_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
+ void *event_info EINA_UNUSED)
{
_edi_file_new();
}
static void
_edi_menu_save_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
+ void *event_info EINA_UNUSED)
{
edi_mainview_save();
}
static void
+_edi_menu_open_window_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+ void *event_info EINA_UNUSED)
+{
+ edi_mainview_new_window();
+}
+
+static void
+_edi_menu_close_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+ void *event_info EINA_UNUSED)
+{
+ edi_mainview_close();
+}
+
+static void
_edi_menu_settings_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
+ void *event_info EINA_UNUSED)
{
edi_settings_show(_edi_main_win);
}
static void
_edi_menu_quit_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
+ void *event_info EINA_UNUSED)
{
elm_exit();
}
static void
+_edi_menu_cut_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+ void *event_info EINA_UNUSED)
+{
+ edi_mainview_cut();
+}
+
+static void
+_edi_menu_copy_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+ void *event_info EINA_UNUSED)
+{
+ edi_mainview_copy();
+}
+
+static void
+_edi_menu_paste_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+ void *event_info EINA_UNUSED)
+{
+ edi_mainview_paste();
+}
+
+static void
+_edi_menu_find_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+ void *event_info EINA_UNUSED)
+{
+ edi_mainview_search();
+}
+
+static void
+_edi_menu_goto_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+ void *event_info EINA_UNUSED)
+{
+ _edi_edit_goto();
+}
+
+static void
+_edi_menu_build_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+ void *event_info EINA_UNUSED)
+{
+ edi_builder_build();
+}
+
+static void
+_edi_menu_test_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+ void *event_info EINA_UNUSED)
+{
+ edi_builder_test();
+}
+
+static void
+_edi_menu_clean_cb(void *data EINA_UNUSED,
[EGIT] [editors/jedit-configs] master 01/01: eo: highlight import keyword
q66 pushed a commit to branch master. http://git.enlightenment.org/editors/jedit-configs.git/commit/?id=d65ef4913f3fcd5fedbfd128602edffa4bc7bdb5 commit d65ef4913f3fcd5fedbfd128602edffa4bc7bdb5 Author: Daniel Kolesa d.kol...@osg.samsung.com Date: Tue May 19 16:57:05 2015 +0100 eo: highlight import keyword --- eo/eo.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/eo/eo.xml b/eo/eo.xml index 2618c88..73ea876 100644 --- a/eo/eo.xml +++ b/eo/eo.xml @@ -87,6 +87,7 @@ KEYWORD1constructors/KEYWORD1 KEYWORD1events/KEYWORD1 KEYWORD1get/KEYWORD1 +KEYWORD1import/KEYWORD1 KEYWORD1interface/KEYWORD1 KEYWORD1keys/KEYWORD1 KEYWORD1methods/KEYWORD1 --
