From: Enlightenment S. <no-...@en...> - 2010-10-12 04:34:49
|
Log: Make 'Tiled' actually do a tile :) Author: devilhorns Date: 2010-10-11 21:34:42 -0700 (Mon, 11 Oct 2010) New Revision: 53292 Modified: trunk/TMP/st/elementary/src/lib/elm_bg.c Modified: trunk/TMP/st/elementary/src/lib/elm_bg.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_bg.c 2010-10-12 04:21:50 UTC (rev 53291) +++ trunk/TMP/st/elementary/src/lib/elm_bg.c 2010-10-12 04:34:42 UTC (rev 53292) @@ -70,8 +70,8 @@ else if (wd->option == ELM_BG_TILE) { x = y = 0; - w = ow; - h = oh; + w = iw; + h = ih; } evas_object_image_fill_set(obj, x, y, w, h); } |
From: Enlightenment S. <no-...@en...> - 2010-10-12 08:46:23
|
Log: Add ability for elm_bg to have a color rectangle. Add ability for elm_bg to have 'overlays' such as animated fog, etc. Normalize elm_bg internal object names: Rename wd->img to the more generic wd->base. Remove erroneous evas_object_resize(wd->base, 0, 0) (not needed). Fix typo in doxy comment. Add doxy for new functions (color_set, overlay_set) Add swallow part in edc for bg color rectangle. Fix overlay swallow part offsets. Author: devilhorns Date: 2010-10-12 01:46:17 -0700 (Tue, 12 Oct 2010) New Revision: 53299 Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_bg.c Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/TMP/st/elementary/src/lib/Elementary.h.in 2010-10-12 07:55:45 UTC (rev 53298) +++ trunk/TMP/st/elementary/src/lib/Elementary.h.in 2010-10-12 08:46:17 UTC (rev 53299) @@ -455,6 +455,8 @@ EAPI Evas_Object *elm_bg_add(Evas_Object *parent); EAPI void elm_bg_file_set(Evas_Object *obj, const char *file, const char *group); EAPI void elm_bg_option_set(Evas_Object *obj, Elm_Bg_Option option); + EAPI void elm_bg_color_set(Evas_Object *obj, int r, int g, int b); + EAPI void elm_bg_overlay_set(Evas_Object *obj, Evas_Object *overlay); /* smart callbacks called: */ Modified: trunk/TMP/st/elementary/src/lib/elm_bg.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_bg.c 2010-10-12 07:55:45 UTC (rev 53298) +++ trunk/TMP/st/elementary/src/lib/elm_bg.c 2010-10-12 08:46:17 UTC (rev 53299) @@ -12,12 +12,13 @@ struct _Widget_Data { - Evas_Object *img, *custom_img; + Evas_Object *base, *rect, *img, *overlay; const char *file, *group; Elm_Bg_Option option; }; static const char *widtype = NULL; + static void _del_hook(Evas_Object *obj); static void _theme_hook(Evas_Object *obj); static void _custom_resize(void *data, Evas *a, Evas_Object *obj, void *event_info); @@ -35,13 +36,19 @@ Widget_Data *wd = elm_widget_data_get(obj); Evas_Coord w, h; - _elm_theme_object_set(obj, wd->img, "bg", "base", elm_widget_style_get(obj)); - if (wd->custom_img) - edje_object_part_swallow(wd->img, "elm.swallow.background", wd->custom_img); + _elm_theme_object_set(obj, wd->base, "bg", "base", + elm_widget_style_get(obj)); + + if (wd->rect) + edje_object_part_swallow(wd->base, "elm.swallow.rectangle", wd->rect); + if (wd->img) + edje_object_part_swallow(wd->base, "elm.swallow.background", wd->img); + if (wd->overlay) + edje_object_part_swallow(wd->base, "elm.swallow.content", wd->overlay); + // FIXME: if i don't do this, bg doesnt calc correctly. why? - evas_object_geometry_get(wd->img, NULL, NULL, &w, &h); - evas_object_resize(wd->img, 0, 0); - evas_object_resize(wd->img, w, h); + evas_object_geometry_get(wd->base, NULL, NULL, &w, &h); + evas_object_resize(wd->base, w, h); } static void @@ -102,9 +109,9 @@ elm_widget_theme_hook_set(obj, _theme_hook); elm_widget_can_focus_set(obj, EINA_FALSE); - wd->img = edje_object_add(e); - _elm_theme_object_set(obj, wd->img, "bg", "base", "default"); - elm_widget_resize_object_set(obj, wd->img); + wd->base = edje_object_add(e); + _elm_theme_object_set(obj, wd->base, "bg", "base", "default"); + elm_widget_resize_object_set(obj, wd->base); wd->option = ELM_BG_SCALE; return obj; @@ -119,7 +126,7 @@ * * This sets the image file used in the background object. The image (or edje) * will be stretched (retaining aspect if its an image file) to completely fill - * the bg object. This may mean some parts arte not visible. + * the bg object. This may mean some parts are not visible. * * @ingroup Bg */ @@ -130,32 +137,43 @@ Widget_Data *wd = elm_widget_data_get(obj); const char *p; - if (wd->custom_img) + if (wd->img) { - evas_object_del(wd->custom_img); - wd->custom_img = NULL; + evas_object_del(wd->img); + wd->img = NULL; } if (!file) return; eina_stringshare_replace(&wd->file, file); eina_stringshare_replace(&wd->group, group); if (((p = strrchr(file, '.'))) && (!strcasecmp(p, ".edj"))) { - wd->custom_img = edje_object_add(evas_object_evas_get(wd->img)); - edje_object_file_set(wd->custom_img, file, group); + wd->img = edje_object_add(evas_object_evas_get(wd->base)); + edje_object_file_set(wd->img, file, group); } else { - wd->custom_img = evas_object_image_add(evas_object_evas_get(wd->img)); - evas_object_event_callback_add(wd->custom_img, EVAS_CALLBACK_RESIZE, + wd->img = evas_object_image_add(evas_object_evas_get(wd->base)); + evas_object_event_callback_add(wd->img, EVAS_CALLBACK_RESIZE, _custom_resize, wd); - evas_object_image_file_set(wd->custom_img, file, group); + evas_object_image_file_set(wd->img, file, group); } - elm_widget_sub_object_add(obj, wd->custom_img); - evas_object_repeat_events_set(wd->custom_img, 1); - edje_object_part_swallow(wd->img, "elm.swallow.background", wd->custom_img); - evas_object_show(wd->custom_img); + elm_widget_sub_object_add(obj, wd->img); + evas_object_repeat_events_set(wd->img, EINA_TRUE); + edje_object_part_swallow(wd->base, "elm.swallow.background", wd->img); + evas_object_show(wd->img); } +/** + * Set the option used for the background image + * + * @param obj The bg object + * @param option The desired background option (TILE, SCALE) + * + * This sets the option used for manipulating the display of the background + * image. The image can be tiled or scaled. + * + * @ingroup Bg + */ EAPI void elm_bg_option_set(Evas_Object *obj, Elm_Bg_Option option) { @@ -165,3 +183,60 @@ wd = elm_widget_data_get(obj); wd->option = option; } + +/** + * Set the option used for the background color + * + * @param obj The bg object + * @param r + * @param g + * @param b + * + * This sets the color used for the background rectangle. + * + * @ingroup Bg + */ +EAPI void +elm_bg_color_set(Evas_Object *obj, int r, int g, int b) +{ + ELM_CHECK_WIDTYPE(obj, widtype); + Widget_Data *wd; + + wd = elm_widget_data_get(obj); + if (!wd->rect) + { + wd->rect = evas_object_rectangle_add(evas_object_evas_get(wd->base)); + elm_widget_sub_object_add(obj, wd->rect); + edje_object_part_swallow(wd->base, "elm.swallow.rectangle", wd->rect); + } + evas_object_color_set(wd->rect, r, g, b, 255); + evas_object_show(wd->rect); +} + +/** + * Set the overlay object used for the background object. + * + * @param obj The bg object + * @param overlay The overlay object + * + * This provides a way for elm_bg to have an 'overlay' (such as animated fog) + * + * @ingroup Bg + */ +EAPI void +elm_bg_overlay_set(Evas_Object *obj, Evas_Object *overlay) +{ + ELM_CHECK_WIDTYPE(obj, widtype); + Widget_Data *wd; + + wd = elm_widget_data_get(obj); + if (wd->overlay) + { + evas_object_del(wd->overlay); + wd->overlay = NULL; + } + if (!overlay) return; + wd->overlay = overlay; + elm_widget_sub_object_add(obj, wd->overlay); + edje_object_part_swallow(wd->base, "elm.swallow.content", wd->overlay); +} |
From: Enlightenment S. <no-...@en...> - 2010-10-12 10:30:39
|
Log: Better name(s) for the bg option enum. Author: devilhorns Date: 2010-10-12 03:30:32 -0700 (Tue, 12 Oct 2010) New Revision: 53302 Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_bg.c Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/TMP/st/elementary/src/lib/Elementary.h.in 2010-10-12 09:36:58 UTC (rev 53301) +++ trunk/TMP/st/elementary/src/lib/Elementary.h.in 2010-10-12 10:30:32 UTC (rev 53302) @@ -448,8 +448,8 @@ */ typedef enum _Elm_Bg_Option { - ELM_BG_SCALE, - ELM_BG_TILE + ELM_BG_OPTION_SCALE, + ELM_BG_OPTION_TILE } Elm_Bg_Option; EAPI Evas_Object *elm_bg_add(Evas_Object *parent); Modified: trunk/TMP/st/elementary/src/lib/elm_bg.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_bg.c 2010-10-12 09:36:58 UTC (rev 53301) +++ trunk/TMP/st/elementary/src/lib/elm_bg.c 2010-10-12 10:30:32 UTC (rev 53302) @@ -62,7 +62,7 @@ evas_object_image_size_get(obj, &iw, &ih); if ((iw < 1) || (ih < 1)) return; - if (wd->option == ELM_BG_SCALE) + if (wd->option == ELM_BG_OPTION_SCALE) { w = ow; h = (ih * w) / iw; @@ -74,7 +74,7 @@ x = (ow - w) / 2; y = (oh - h) / 2; } - else if (wd->option == ELM_BG_TILE) + else if (wd->option == ELM_BG_OPTION_TILE) { x = y = 0; w = iw; @@ -113,7 +113,7 @@ _elm_theme_object_set(obj, wd->base, "bg", "base", "default"); elm_widget_resize_object_set(obj, wd->base); - wd->option = ELM_BG_SCALE; + wd->option = ELM_BG_OPTION_SCALE; return obj; } |
From: Enlightenment S. <no-...@en...> - 2010-10-12 21:10:19
|
Log: Some colorpicker cleanups: Don't need Ecore.h here, Elementary.h already includes it Fix formatting. Use #define for signal name rather than const char Initialize integer's with a value. Add 'changed' signal to Elementary.h so people know it emits changed also. Author: devilhorns Date: 2010-10-12 14:10:12 -0700 (Tue, 12 Oct 2010) New Revision: 53314 Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_colorpicker.c Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/TMP/st/elementary/src/lib/Elementary.h.in 2010-10-12 20:38:00 UTC (rev 53313) +++ trunk/TMP/st/elementary/src/lib/Elementary.h.in 2010-10-12 21:10:12 UTC (rev 53314) @@ -1946,6 +1946,7 @@ EAPI void elm_colorpicker_color_get(Evas_Object *obj, int *r, int *g , int *b, int *a); /* smart callbacks called: * "clicked" - when bar or button is clicked + * "changed" - when the color value changes */ /* debug Modified: trunk/TMP/st/elementary/src/lib/elm_colorpicker.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_colorpicker.c 2010-10-12 20:38:00 UTC (rev 53313) +++ trunk/TMP/st/elementary/src/lib/elm_colorpicker.c 2010-10-12 21:10:12 UTC (rev 53314) @@ -1,6 +1,5 @@ #include <Elementary.h> #include "elm_priv.h" -#include <Ecore.h> /** * @addtogroup Colorpicker Colorpicker @@ -48,13 +47,14 @@ }; typedef enum - { - BUTTON_RELEASED, - L_BUTTON_PRESSED, - R_BUTTON_PRESSED - } Button_State; +{ + BUTTON_RELEASED, + L_BUTTON_PRESSED, + R_BUTTON_PRESSED +} Button_State; static const char *widtype = NULL; + static void _del_hook(Evas_Object *obj); static void _theme_hook(Evas_Object *obj); static void _sizing_eval(Evas_Object *obj); @@ -75,20 +75,21 @@ static void _add_colorbar(Evas_Object *obj); static void _set_color(Evas_Object *obj, int r, int g, int b, int a); -static const char SIG_CHANGED[] = "changed"; -static const Evas_Smart_Cb_Description _signals[] = { - {SIG_CHANGED, ""}, - {NULL, NULL} +#define SIG_CHANGED "changed" + +static const Evas_Smart_Cb_Description _signals[] = +{ + {SIG_CHANGED, ""}, + {NULL, NULL} }; static void _del_hook(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); - int i; + int i = 0; - if (!wd) - return; + if (!wd) return; if (wd->lp_timer) ecore_timer_del(wd->lp_timer); @@ -96,9 +97,7 @@ ecore_timer_del(wd->mv_timer); for (i = 0; i < 4; i++) - { - free(wd->cp[i]); - } + free(wd->cp[i]); free(wd); } @@ -107,10 +106,9 @@ _theme_hook(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); - int i; + int i = 0; - if (!wd || !wd->base) - return; + if ((!wd) || (!wd->base)) return; _elm_theme_object_set(obj, wd->base, "colorpicker", "bg", elm_widget_style_get(obj)); @@ -145,6 +143,7 @@ { Widget_Data *wd = elm_widget_data_get(obj); Evas_Coord minw = -1, minh = -1; + if (!wd) return; elm_coords_finger_size_adjust(4, &minw, 4, &minh); edje_object_size_min_restricted_calc(wd->base, &minw, &minh, minw, minh); @@ -214,7 +213,7 @@ Widget_Data *wd = data; double r = 0, g = 0, b = 0; double _h, _s, _l; - int i; + int i = 0; double sv, vsf, f, p, q, t, v; _h = wd->h; @@ -487,8 +486,7 @@ Widget_Data *wd = elm_widget_data_get(cp->parent); double x, y; - if (!cp || !wd) - return 0; + if ((!cp) || (!wd)) return 0; edje_object_part_drag_value_get(cp->colorbar, "elm.arrow", &x, &y); if (cp->button_state == L_BUTTON_PRESSED) @@ -649,7 +647,7 @@ char colorbar_s[128]; Widget_Data *wd; Evas *e; - int i; + int i = 0; wd = elm_widget_data_get(obj); if (!wd) return; |
From: Enlightenment S. <no-...@en...> - 2010-10-13 17:50:26
|
Log: Fix typo (I believe the word is breaking) ;) Author: devilhorns Date: 2010-10-13 10:50:20 -0700 (Wed, 13 Oct 2010) New Revision: 53372 Modified: trunk/TMP/st/elementary/src/lib/elm_widget.h Modified: trunk/TMP/st/elementary/src/lib/elm_widget.h =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_widget.h 2010-10-13 17:46:02 UTC (rev 53371) +++ trunk/TMP/st/elementary/src/lib/elm_widget.h 2010-10-13 17:50:20 UTC (rev 53372) @@ -1,7 +1,7 @@ #ifndef ELM_WIDGET_H #define ELM_WIDGET_H -/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BEAKING OF YOUR +/* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK IT * AT RUNTIME |
From: Enlightenment S. <no-...@en...> - 2010-10-14 18:18:41
|
Log: Make elm build again (remove duplicated function declarations which had different params) ... come on people, at least build your code before committing Author: devilhorns Date: 2010-10-14 11:18:34 -0700 (Thu, 14 Oct 2010) New Revision: 53422 Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_toolbar.c Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in =================================================================== --- trunk/TMP/st/elementary/src/lib/Elementary.h.in 2010-10-14 17:58:01 UTC (rev 53421) +++ trunk/TMP/st/elementary/src/lib/Elementary.h.in 2010-10-14 18:18:34 UTC (rev 53422) @@ -1150,6 +1150,7 @@ EAPI void elm_toolbar_align_set(Evas_Object *obj, double align); EAPI double elm_toolbar_align_get(const Evas_Object *obj); EAPI void elm_toolbar_item_menu_set(Elm_Toolbar_Item *item, Eina_Bool menu); + EAPI Evas_Object *elm_toolbar_item_menu_get(Elm_Toolbar_Item *item); EAPI void elm_toolbar_item_tooltip_text_set(Elm_Toolbar_Item *item, const char *text); EAPI void elm_toolbar_item_tooltip_content_cb_set(Elm_Toolbar_Item *item, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb); @@ -1173,15 +1174,6 @@ EAPI Elm_Toolbar_Item *elm_toolbar_item_find_by_label(Evas_Object *obj, const char *label); EAPI void elm_toolbar_scrollable_set(Evas_Object *obj, Eina_Bool scrollable); EAPI Eina_Bool elm_toolbar_scrollable_get(Evas_Object *obj); - EAPI void elm_toolbar_homogenous_set(Evas_Object *obj, Eina_Bool homogenous); - EAPI Eina_Bool elm_toolbar_homogenous_get(Evas_Object *obj); - EAPI void elm_toolbar_menu_parent_set(Evas_Object *obj, Evas_Object *parent); - EAPI Evas_Object *elm_toolbar_menu_parent_get(Evas_Object *obj); - EAPI void elm_toolbar_item_unselect_all(Evas_Object *obj); - EAPI void elm_toolbar_align_set(Evas_Object *obj, double align); - EAPI double elm_toolbar_align_get(const Evas_Object *obj); - EAPI void elm_toolbar_item_menu_set(Elm_Toolbar_Item *item, Eina_Bool menu); - EAPI Evas_Object *elm_toolbar_item_menu_get(Elm_Toolbar_Item *item); /* smart callbacks called: * "clicked" - when the user clicks on a toolbar item and becomes selected */ Modified: trunk/TMP/st/elementary/src/lib/elm_toolbar.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2010-10-14 17:58:01 UTC (rev 53421) +++ trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2010-10-14 18:18:34 UTC (rev 53422) @@ -940,12 +940,12 @@ * @ingroup Toolbar */ EAPI Evas_Object * -elm_toolbar_menu_parent_get(Evas_Object *obj) +elm_toolbar_menu_parent_get(const Evas_Object *obj) { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return NULL; - return wd->menu_parent; } |
From: Enlightenment S. <no-...@en...> - 2010-10-15 10:32:36
|
Log: Not sure what happened here, but elm_widget_display_only_get does not exist. Comment out function call until this gets sorted, so @ least elm will build. Did nobody compile this before commit again ??? :( Author: devilhorns Date: 2010-10-15 03:32:29 -0700 (Fri, 15 Oct 2010) New Revision: 53439 Modified: trunk/TMP/st/elementary/src/lib/elm_genlist.c Modified: trunk/TMP/st/elementary/src/lib/elm_genlist.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_genlist.c 2010-10-15 08:36:57 UTC (rev 53438) +++ trunk/TMP/st/elementary/src/lib/elm_genlist.c 2010-10-15 10:32:29 UTC (rev 53439) @@ -382,7 +382,7 @@ if (!wd) return EINA_FALSE; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE; if (elm_widget_disabled_get(obj)) return EINA_FALSE; - if (elm_widget_display_only_get(obj)) return EINA_FALSE; +// if (elm_widget_display_only_get(obj)) return EINA_FALSE; Elm_Genlist_Item *it = NULL; Evas_Coord x = 0; |
From: Enlightenment S. <no-...@en...> - 2010-10-15 13:36:52
|
Log: No need to create an elm_icon if widget_data is NULL. If creating the elm_widget_item fails, delete the created elm_icon also. Author: devilhorns Date: 2010-10-15 06:36:44 -0700 (Fri, 15 Oct 2010) New Revision: 53451 Modified: trunk/TMP/st/elementary/src/lib/elm_toolbar.c Modified: trunk/TMP/st/elementary/src/lib/elm_toolbar.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2010-10-15 13:24:51 UTC (rev 53450) +++ trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2010-10-15 13:36:44 UTC (rev 53451) @@ -538,11 +538,15 @@ Evas_Coord mw, mh; Elm_Toolbar_Item *it; + if (!wd) return NULL; icon_obj = elm_icon_add(obj); if (!icon_obj) return NULL; - if (!wd) return NULL; it = elm_widget_item_new(obj, Elm_Toolbar_Item); - if (!it) return NULL; + if (!it) + { + evas_object_del(icon_obj); + return NULL; + } wd->items = eina_list_append(wd->items, it); it->label = eina_stringshare_add(label); it->prio.visible = 1; @@ -563,8 +567,8 @@ evas_object_del(icon_obj); } - _elm_theme_object_set - (obj, it->base.view, "toolbar", "item", elm_widget_style_get(obj)); + _elm_theme_object_set(obj, it->base.view, "toolbar", "item", + elm_widget_style_get(obj)); edje_object_signal_callback_add(it->base.view, "elm,action,click", "elm", _select, it); elm_widget_sub_object_add(obj, it->base.view); |
From: Enlightenment S. <no-...@en...> - 2010-10-15 13:42:03
|
Log: Do variable checks correctly (we cannot get widget data if Item does not exist, so check for a valid Item first). Author: devilhorns Date: 2010-10-15 06:41:56 -0700 (Fri, 15 Oct 2010) New Revision: 53452 Modified: trunk/TMP/st/elementary/src/lib/elm_toolbar.c Modified: trunk/TMP/st/elementary/src/lib/elm_toolbar.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2010-10-15 13:36:44 UTC (rev 53451) +++ trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2010-10-15 13:41:56 UTC (rev 53452) @@ -728,10 +728,13 @@ EAPI void elm_toolbar_item_del(Elm_Toolbar_Item *it) { - Widget_Data *wd = elm_widget_data_get(it->base.widget); - Evas_Object *obj2 = it->base.widget; + Widget_Data *wd; + Evas_Object *obj2; - if ((!wd) || (!it)) return; + if ((!it) || (!it->base.widget)) return; + wd = elm_widget_data_get(it->base.widget); + if (!wd) return; + obj2 = it->base.widget; elm_widget_item_pre_notify_del(it); wd->items = eina_list_remove(wd->items, it); eina_stringshare_del(it->label); |
From: Enlightenment S. <no-...@en...> - 2010-10-15 23:04:02
|
Log: Fix elm_bg overlay issue: The problem was that when you toggle show/hide overlay in ELM_BG_CENTER mode, the 'image' itself would not retain it's proper size (it would fill the whole swallow and thus not be 'centered' anymore). Solved by setting hint_min/max on the image when in centered mode. NB: Raster this fixes that elm_bg issue I mentioned the other day so all is well now ;) Author: devilhorns Date: 2010-10-15 16:03:56 -0700 (Fri, 15 Oct 2010) New Revision: 53476 Modified: trunk/TMP/st/elementary/src/lib/elm_bg.c Modified: trunk/TMP/st/elementary/src/lib/elm_bg.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_bg.c 2010-10-15 22:52:27 UTC (rev 53475) +++ trunk/TMP/st/elementary/src/lib/elm_bg.c 2010-10-15 23:03:56 UTC (rev 53476) @@ -56,7 +56,7 @@ { Widget_Data *wd = data; Evas_Coord bx = 0, by = 0, bw = 0, bh = 0; - Evas_Coord iw = 0, ih = 0; + Evas_Coord iw = 0, ih = 0, mw = -1, mh = -1; Evas_Coord fx = 0, fy = 0, fw = 0, fh = 0; Evas_Coord nx = 0, ny = 0, nw = 0, nh = 0; const char *p; @@ -84,6 +84,8 @@ fh = nh = ih; nx = ((bw - fw) / 2); ny = ((bh - fh) / 2); + mw = iw; + mh = ih; break; case ELM_BG_OPTION_SCALE: fw = bw; @@ -107,9 +109,12 @@ break; } - evas_object_image_fill_set(wd->img, fx, fy, fw, fh); evas_object_move(wd->img, nx, ny); evas_object_resize(wd->img, nw, nh); + evas_object_image_fill_set(wd->img, fx, fy, fw, fh); + + evas_object_size_hint_min_set(wd->img, mw, mh); + evas_object_size_hint_max_set(wd->img, mw, mh); } /** |
From: Enlightenment S. <no-...@en...> - 2010-12-24 09:58:27
|
Log: Patch from WooHyun Jung to fix small bug in elm_main: "exe" is used just after "free(exe)". Author: devilhorns Date: 2010-12-24 01:58:20 -0800 (Fri, 24 Dec 2010) New Revision: 55743 Trac: http://trac.enlightenment.org/e/changeset/55743 Modified: trunk/TMP/st/elementary/src/lib/elm_main.c Modified: trunk/TMP/st/elementary/src/lib/elm_main.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_main.c 2010-12-23 18:06:43 UTC (rev 55742) +++ trunk/TMP/st/elementary/src/lib/elm_main.c 2010-12-24 09:58:20 UTC (rev 55743) @@ -755,7 +755,6 @@ return EINA_FALSE; } INF("dlopen('%s') = %p", exe, qr_handle); - free(exe); qr_main = dlsym(qr_handle, "elm_main"); INF("dlsym(%p, 'elm_main') = %p", qr_handle, qr_main); if (!qr_main) @@ -763,8 +762,10 @@ WRN("not quicklauncher capable: no elm_main in '%s'", exe); dlclose(qr_handle); qr_handle = NULL; + free(exe); return EINA_FALSE; } + free(exe); return EINA_TRUE; #else return EINA_FALSE; |
From: Enlightenment S. <no-...@en...> - 2010-12-31 01:08:08
|
Log: Fix up functions & prototypes to match the proper ElmMapSourceURLFunc declaration so we can remove stupid "nobody checked the code" compiler warnings. Author: devilhorns Date: 2010-12-30 17:08:01 -0800 (Thu, 30 Dec 2010) New Revision: 55783 Trac: http://trac.enlightenment.org/e/changeset/55783 Modified: trunk/TMP/st/elementary/src/lib/elm_map.c Modified: trunk/TMP/st/elementary/src/lib/elm_map.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_map.c 2010-12-30 23:15:01 UTC (rev 55782) +++ trunk/TMP/st/elementary/src/lib/elm_map.c 2010-12-31 01:08:01 UTC (rev 55783) @@ -68,11 +68,11 @@ #define ZOOM_MAX 18 //Zemm min is supposed to be 0 -static char * _mapnik_url_cb(void *data ,int x, int y, int zoom); -static char * _osmarender_url_cb(void *data ,int x, int y, int zoom); -static char * _cyclemap_url_cb(void *data ,int x, int y, int zoom); -static char * _maplint_url_cb(void *data ,int x, int y, int zoom); -static char * _module_url_cb(void *data ,int x, int y, int zoom); +static char *_mapnik_url_cb(Evas_Object *obj __UNUSED__,int x, int y, int zoom); +static char *_osmarender_url_cb(Evas_Object *obj __UNUSED__,int x, int y, int zoom); +static char *_cyclemap_url_cb(Evas_Object *obj __UNUSED__,int x, int y, int zoom); +static char *_maplint_url_cb(Evas_Object *obj __UNUSED__,int x, int y, int zoom); +static char *_module_url_cb(Evas_Object *obj,int x, int y, int zoom); static Map_Sources_Tab map_sources_tab[] = { {ELM_MAP_SOURCE_MAPNIK, "Mapnik", 0, 18, _mapnik_url_cb}, @@ -3111,7 +3111,7 @@ static char * -_mapnik_url_cb(void *data, int x, int y, int zoom) +_mapnik_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom) { char buf[PATH_MAX]; snprintf(buf, sizeof(buf), "http://tile.openstreetmap.org/%d/%d/%d.png", @@ -3120,40 +3120,43 @@ } static char * -_osmarender_url_cb(void * data, int x, int y, int zoom) +_osmarender_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom) { char buf[PATH_MAX]; - snprintf(buf, sizeof(buf), "http://tah.openstreetmap.org/Tiles/tile/%d/%d/%d.png", + snprintf(buf, sizeof(buf), + "http://tah.openstreetmap.org/Tiles/tile/%d/%d/%d.png", zoom, x, y); return strdup(buf); } static char * -_cyclemap_url_cb(void *data, int x, int y, int zoom) +_cyclemap_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom) { char buf[PATH_MAX]; - snprintf(buf, sizeof(buf), "http://andy.sandbox.cloudmade.com/tiles/cycle/%d/%d/%d.png", + snprintf(buf, sizeof(buf), + "http://andy.sandbox.cloudmade.com/tiles/cycle/%d/%d/%d.png", zoom, x, y); return strdup(buf); } static char * -_maplint_url_cb(void *data, int x, int y, int zoom) +_maplint_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom) { char buf[PATH_MAX]; - snprintf(buf, sizeof(buf), "http://tah.openstreetmap.org/Tiles/maplint/%d/%d/%d.png", + snprintf(buf, sizeof(buf), + "http://tah.openstreetmap.org/Tiles/maplint/%d/%d/%d.png", zoom, x, y); return strdup(buf); } static char * -_module_url_cb(void *data, int x, int y, int zoom) +_module_url_cb(Evas_Object *obj, int x, int y, int zoom) { char *buf = NULL; - Widget_Data *wd = elm_widget_data_get(data); - if(elm_map_source_get(data) == ELM_MAP_SOURCE_MODULE) + Widget_Data *wd = elm_widget_data_get(obj); + if (elm_map_source_get(obj) == ELM_MAP_SOURCE_MODULE) if ((wd->api) && (wd->api->obj_url_request)) - buf = wd->api->obj_url_request(data, x, y, zoom); + buf = wd->api->obj_url_request(obj, x, y, zoom); if(!buf) buf = strdup(""); |
From: Enlightenment S. <no-...@en...> - 2010-12-31 01:08:47
|
Log: If you add new atom names, be sure to bump the atom count. (This removes more nasty compiler messages about excess elements in array initializer, etc, etc). Author: devilhorns Date: 2010-12-30 17:08:41 -0800 (Thu, 30 Dec 2010) New Revision: 55784 Trac: http://trac.enlightenment.org/e/changeset/55784 Modified: trunk/TMP/st/elementary/src/lib/elm_config.c Modified: trunk/TMP/st/elementary/src/lib/elm_config.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_config.c 2010-12-31 01:08:01 UTC (rev 55783) +++ trunk/TMP/st/elementary/src/lib/elm_config.c 2010-12-31 01:08:41 UTC (rev 55784) @@ -73,7 +73,7 @@ #ifdef HAVE_ELEMENTARY_X static Ecore_Event_Handler *_prop_change_handler = NULL; static Ecore_X_Window _root_1st = 0; -#define ATOM_COUNT 21 +#define ATOM_COUNT 22 static Ecore_X_Atom _atom[ATOM_COUNT]; static Ecore_X_Atom _atom_config = 0; static const char *_atom_names[ATOM_COUNT] = |