2018-02-17 21:24 GMT+01:00 Marcel Hollerbach <mar...@osg.samsung.com>:
> bu5hm4n pushed a commit to branch master. > > http://git.enlightenment.org/core/efl.git/commit/?id= > c93bd1b81b7c7b108911db49b011da8ff5f43057 > > commit c93bd1b81b7c7b108911db49b011da8ff5f43057 > Author: Marcel Hollerbach <mar...@osg.samsung.com> > Date: Mon Feb 12 18:34:03 2018 +0100 > > Introduction of buildtools! > > buildtool is a little static library for the abstraction of buildtool > depedend path generation. > This commit include a change related to Popup focus... > --- > src/lib/elementary/elc_popup.c | 4 +- > src/static_libs/buildsystem/buildsystem.h | 24 +++++++++++ > .../buildsystem/buildsystem_autotools.c | 50 > ++++++++++++++++++++++ > 3 files changed, 76 insertions(+), 2 deletions(-) > > diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_ > popup.c > index 9920251437..eddca3ef15 100644 > --- a/src/lib/elementary/elc_popup.c > +++ b/src/lib/elementary/elc_popup.c > @@ -1454,7 +1454,7 @@ _elm_popup_efl_canvas_group_group_add(Eo *obj, > Elm_Popup_Data *priv) > priv->content_text_wrap_type = ELM_WRAP_MIXED; > efl_event_callback_array_add(priv->notify, _notify_cb(), obj); > > - elm_widget_can_focus_set(obj, EINA_TRUE); > + elm_widget_can_focus_set(obj, EINA_FALSE); > elm_widget_can_focus_set(priv->main_layout, EINA_TRUE); > > _populate_theme_scroll(priv); > @@ -1853,7 +1853,7 @@ ELM_PART_CONTENT_DEFAULT_GET(elm_popup, "default") > #define ELM_POPUP_EXTRA_OPS \ > ELM_LAYOUT_SIZING_EVAL_OPS(elm_popup), \ > EFL_CANVAS_GROUP_ADD_DEL_OPS(elm_popup), \ > - ELM_PART_CONTENT_DEFAULT_OPS(elm_popup) > + ELM_PART_CONTENT_DEFAULT_OPS(elm_popup) > > #include "elm_popup.eo.c" > #include "elm_popup_item.eo.c" > diff --git a/src/static_libs/buildsystem/buildsystem.h > b/src/static_libs/buildsystem/buildsystem.h > new file mode 100644 > index 0000000000..5312fa85e7 > --- /dev/null > +++ b/src/static_libs/buildsystem/buildsystem.h > @@ -0,0 +1,24 @@ > +/* > + * A little helper library for abstracting the path finding which depends > on autotools (or later on other buildsystems) > + * > + * Author: Marcel Hollerbach > + */ > +#include <stdio.h> > +#include <Eina.h> > + > +/* > + * Fills the provided buffer with the path to the binary of a given > subsystem > + */ > +Eina_Bool bs_binary_get(char *path, size_t maxlen, const char *subsystem, > const char *bin_name); > + > +/* > + * Fills the provided buffer with the path to the data file/dir of a > given subsystem > + */ > +Eina_Bool bs_data_path_get(char *path, size_t maxlen, const char > *subsystem, const char *file); > + > +/* > + * Fills the provided buffer with the path to the .so file for modules of > a given subsystem > + */ > +Eina_Bool bs_mod_get(char *path, size_t maxlen, const char *subsystem, > const char *mod_name); > + > +Eina_Bool bs_mod_dir_get(char *path, size_t maxlen, const char > *subsystem, const char *mod_name); > diff --git a/src/static_libs/buildsystem/buildsystem_autotools.c > b/src/static_libs/buildsystem/buildsystem_autotools.c > new file mode 100644 > index 0000000000..83d8c1f2df > --- /dev/null > +++ b/src/static_libs/buildsystem/buildsystem_autotools.c > @@ -0,0 +1,50 @@ > +#ifdef _WIN32 > +# define BIN_EXT ".exe" > +#else > +# define BIN_EXT "" > +#endif > + > +#include "config.h" > + > +#include <stdio.h> > +#include <Eina.h> > + > +Eina_Bool > +bs_mod_get(char *path, size_t maxlen, const char *subsystem, const char > *mod_name) > +{ > + if (!getenv("EFL_RUN_IN_TREE")) return EINA_FALSE; > + > + snprintf(path, maxlen, PACKAGE_BUILD_DIR"/src/ > modules/%s/%s/.libs/module"SHARED_LIB_SUFFIX, subsystem, mod_name); > + > + return EINA_TRUE; > +} > + > +Eina_Bool > +bs_mod_dir_get(char *path, size_t maxlen, const char *subsystem, const > char *mod_name) > +{ > + if (!getenv("EFL_RUN_IN_TREE")) return EINA_FALSE; > + > + snprintf(path, maxlen, PACKAGE_BUILD_DIR"/src/modules/%s/%s/.libs", > subsystem, mod_name); > + > + return EINA_TRUE; > +} > + > +Eina_Bool > +bs_binary_get(char *path, size_t maxlen, const char *subsystem, const > char *bin_name) > +{ > + if (!getenv("EFL_RUN_IN_TREE")) return EINA_FALSE; > + > + snprintf(path, maxlen, PACKAGE_BUILD_DIR"/src/bin/%s/%s"BIN_EXT, > subsystem, bin_name); > + > + return EINA_TRUE; > +} > + > +Eina_Bool > +bs_data_path_get(char *path, size_t maxlen, const char *subsystem, const > char *file) > +{ > + if (!getenv("EFL_RUN_IN_TREE")) return EINA_FALSE; > + > + snprintf(path, maxlen, PACKAGE_SRC_DIR"/data/%s/%s", subsystem, file); > + > + return EINA_TRUE; > +} > > -- > > > ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
