forked from enlightenment/efl
Elementary: Removed trailing white spaces.
SVN revision: 58661
This commit is contained in:
parent
f337cf0a31
commit
3d99ec3932
|
@ -9,7 +9,7 @@ fill(Evas_Object *win, Eina_Bool do_bg)
|
||||||
{
|
{
|
||||||
Evas_Object *bg, *sc, *bx, *ic, *bb, *av;
|
Evas_Object *bg, *sc, *bx, *ic, *bb, *av;
|
||||||
char buf[PATH_MAX];
|
char buf[PATH_MAX];
|
||||||
|
|
||||||
if (do_bg)
|
if (do_bg)
|
||||||
{
|
{
|
||||||
bg = elm_bg_add(win);
|
bg = elm_bg_add(win);
|
||||||
|
@ -122,7 +122,7 @@ cb_mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_i
|
||||||
Evas_Coord x, y;
|
Evas_Coord x, y;
|
||||||
Evas_Map *p;
|
Evas_Map *p;
|
||||||
int i, w, h;
|
int i, w, h;
|
||||||
|
|
||||||
if (!ev->buttons) return;
|
if (!ev->buttons) return;
|
||||||
evas_object_geometry_get(obj, &x, &y, NULL, NULL);
|
evas_object_geometry_get(obj, &x, &y, NULL, NULL);
|
||||||
evas_object_move(obj,
|
evas_object_move(obj,
|
||||||
|
@ -136,7 +136,7 @@ cb_mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_i
|
||||||
{
|
{
|
||||||
Evas_Object *hand;
|
Evas_Object *hand;
|
||||||
char key[32];
|
char key[32];
|
||||||
|
|
||||||
snprintf(key, sizeof(key), "h-%i\n", i);
|
snprintf(key, sizeof(key), "h-%i\n", i);
|
||||||
hand = evas_object_data_get(orig, key);
|
hand = evas_object_data_get(orig, key);
|
||||||
evas_object_raise(hand);
|
evas_object_raise(hand);
|
||||||
|
@ -152,20 +152,20 @@ cb_mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_i
|
||||||
evas_object_map_set(orig, p);
|
evas_object_map_set(orig, p);
|
||||||
evas_map_free(p);
|
evas_map_free(p);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
create_handles(Evas_Object *obj)
|
create_handles(Evas_Object *obj)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
Evas_Coord x, y, w, h;
|
Evas_Coord x, y, w, h;
|
||||||
|
|
||||||
evas_object_geometry_get(obj, &x, &y, &w, &h);
|
evas_object_geometry_get(obj, &x, &y, &w, &h);
|
||||||
for (i = 0; i < 4; i++)
|
for (i = 0; i < 4; i++)
|
||||||
{
|
{
|
||||||
Evas_Object *hand;
|
Evas_Object *hand;
|
||||||
char buf[PATH_MAX];
|
char buf[PATH_MAX];
|
||||||
char key[32];
|
char key[32];
|
||||||
|
|
||||||
hand = evas_object_image_filled_add(evas_object_evas_get(obj));
|
hand = evas_object_image_filled_add(evas_object_evas_get(obj));
|
||||||
evas_object_resize(hand, 31, 31);
|
evas_object_resize(hand, 31, 31);
|
||||||
snprintf(buf, sizeof(buf), "%s/images/pt.png", PACKAGE_DATA_DIR);
|
snprintf(buf, sizeof(buf), "%s/images/pt.png", PACKAGE_DATA_DIR);
|
||||||
|
@ -186,7 +186,7 @@ test_win_inline(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_
|
||||||
{
|
{
|
||||||
Evas_Object *win, *bg, *win2, *win3;
|
Evas_Object *win, *bg, *win2, *win3;
|
||||||
char buf[PATH_MAX];
|
char buf[PATH_MAX];
|
||||||
|
|
||||||
win = elm_win_add(NULL, "window-inline", ELM_WIN_BASIC);
|
win = elm_win_add(NULL, "window-inline", ELM_WIN_BASIC);
|
||||||
elm_win_title_set(win, "Window Inline");
|
elm_win_title_set(win, "Window Inline");
|
||||||
elm_win_autodel_set(win, 1);
|
elm_win_autodel_set(win, 1);
|
||||||
|
@ -208,18 +208,18 @@ test_win_inline(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_
|
||||||
evas_object_move(elm_win_inlined_image_object_get(win2), 20, 40);
|
evas_object_move(elm_win_inlined_image_object_get(win2), 20, 40);
|
||||||
evas_object_resize(elm_win_inlined_image_object_get(win2), 200, 320);
|
evas_object_resize(elm_win_inlined_image_object_get(win2), 200, 320);
|
||||||
evas_object_show(win2);
|
evas_object_show(win2);
|
||||||
|
|
||||||
win3 = elm_win_add(win, "inlined", ELM_WIN_INLINED_IMAGE);
|
win3 = elm_win_add(win, "inlined", ELM_WIN_INLINED_IMAGE);
|
||||||
elm_win_alpha_set(win3, EINA_TRUE);
|
elm_win_alpha_set(win3, EINA_TRUE);
|
||||||
fill(win3, EINA_FALSE);
|
fill(win3, EINA_FALSE);
|
||||||
|
|
||||||
evas_object_resize(win3, 300, 200);
|
evas_object_resize(win3, 300, 200);
|
||||||
evas_object_move(elm_win_inlined_image_object_get(win3), 80, 180);
|
evas_object_move(elm_win_inlined_image_object_get(win3), 80, 180);
|
||||||
evas_object_resize(elm_win_inlined_image_object_get(win3), 300, 200);
|
evas_object_resize(elm_win_inlined_image_object_get(win3), 300, 200);
|
||||||
evas_object_show(win3);
|
evas_object_show(win3);
|
||||||
|
|
||||||
create_handles(elm_win_inlined_image_object_get(win3));
|
create_handles(elm_win_inlined_image_object_get(win3));
|
||||||
|
|
||||||
evas_object_resize(win, 400, 600);
|
evas_object_resize(win, 400, 600);
|
||||||
evas_object_show(win);
|
evas_object_show(win);
|
||||||
}
|
}
|
||||||
|
|
|
@ -243,13 +243,13 @@ elm_conformant_add(Evas_Object *parent)
|
||||||
#ifdef HAVE_ELEMENTARY_X
|
#ifdef HAVE_ELEMENTARY_X
|
||||||
Evas_Object *top = elm_widget_top_get(obj);
|
Evas_Object *top = elm_widget_top_get(obj);
|
||||||
Ecore_X_Window zone, xwin = elm_win_xwindow_get(top);
|
Ecore_X_Window zone, xwin = elm_win_xwindow_get(top);
|
||||||
|
|
||||||
if ((xwin) && (!elm_win_inlined_image_object_get(top)))
|
if ((xwin) && (!elm_win_inlined_image_object_get(top)))
|
||||||
{
|
{
|
||||||
int sh = -1;
|
int sh = -1;
|
||||||
|
|
||||||
zone = ecore_x_e_illume_zone_get(xwin);
|
zone = ecore_x_e_illume_zone_get(xwin);
|
||||||
|
|
||||||
ecore_x_e_illume_indicator_geometry_get(zone, NULL, NULL, NULL, &sh);
|
ecore_x_e_illume_indicator_geometry_get(zone, NULL, NULL, NULL, &sh);
|
||||||
if (sh < 0) sh = 0;
|
if (sh < 0) sh = 0;
|
||||||
wd->shelf = evas_object_rectangle_add(e);
|
wd->shelf = evas_object_rectangle_add(e);
|
||||||
|
@ -257,7 +257,7 @@ elm_conformant_add(Evas_Object *parent)
|
||||||
evas_object_size_hint_min_set(wd->shelf, -1, sh);
|
evas_object_size_hint_min_set(wd->shelf, -1, sh);
|
||||||
evas_object_size_hint_max_set(wd->shelf, -1, sh);
|
evas_object_size_hint_max_set(wd->shelf, -1, sh);
|
||||||
edje_object_part_swallow(wd->base, "elm.swallow.shelf", wd->shelf);
|
edje_object_part_swallow(wd->base, "elm.swallow.shelf", wd->shelf);
|
||||||
|
|
||||||
sh = -1;
|
sh = -1;
|
||||||
ecore_x_e_illume_softkey_geometry_get(zone, NULL, NULL, NULL, &sh);
|
ecore_x_e_illume_softkey_geometry_get(zone, NULL, NULL, NULL, &sh);
|
||||||
if (sh < 0) sh = 0;
|
if (sh < 0) sh = 0;
|
||||||
|
@ -266,7 +266,7 @@ elm_conformant_add(Evas_Object *parent)
|
||||||
evas_object_size_hint_min_set(wd->panel, -1, sh);
|
evas_object_size_hint_min_set(wd->panel, -1, sh);
|
||||||
evas_object_size_hint_max_set(wd->panel, -1, sh);
|
evas_object_size_hint_max_set(wd->panel, -1, sh);
|
||||||
edje_object_part_swallow(wd->base, "elm.swallow.panel", wd->panel);
|
edje_object_part_swallow(wd->base, "elm.swallow.panel", wd->panel);
|
||||||
|
|
||||||
wd->prop_hdl = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_PROPERTY,
|
wd->prop_hdl = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_PROPERTY,
|
||||||
_prop_change, obj);
|
_prop_change, obj);
|
||||||
}
|
}
|
||||||
|
|
|
@ -235,7 +235,7 @@ static void
|
||||||
_elm_win_obj_callback_hide(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
|
_elm_win_obj_callback_hide(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
|
||||||
{
|
{
|
||||||
Elm_Win *win = data;
|
Elm_Win *win = data;
|
||||||
|
|
||||||
if (win->frame_obj)
|
if (win->frame_obj)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
@ -339,7 +339,7 @@ static void
|
||||||
_elm_win_obj_intercept_move(void *data, Evas_Object *obj, Evas_Coord x, Evas_Coord y)
|
_elm_win_obj_intercept_move(void *data, Evas_Object *obj, Evas_Coord x, Evas_Coord y)
|
||||||
{
|
{
|
||||||
Elm_Win *win = data;
|
Elm_Win *win = data;
|
||||||
|
|
||||||
if (win->img_obj)
|
if (win->img_obj)
|
||||||
{
|
{
|
||||||
win->screen.x = x;
|
win->screen.x = x;
|
||||||
|
@ -389,7 +389,7 @@ _elm_win_obj_callback_move(void *data, Evas *e __UNUSED__, Evas_Object *obj, voi
|
||||||
else if (win->img_obj)
|
else if (win->img_obj)
|
||||||
{
|
{
|
||||||
Evas_Coord x, y;
|
Evas_Coord x, y;
|
||||||
|
|
||||||
evas_object_geometry_get(obj, &x, &y, NULL, NULL);
|
evas_object_geometry_get(obj, &x, &y, NULL, NULL);
|
||||||
win->screen.x = x;
|
win->screen.x = x;
|
||||||
win->screen.y = y;
|
win->screen.y = y;
|
||||||
|
@ -1129,7 +1129,7 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case ELM_WIN_MEMORY:
|
case ELM_WIN_MEMORY:
|
||||||
// FIXME: implement
|
// FIXME: implement
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
if (ENGINE_COMPARE(ELM_SOFTWARE_X11))
|
if (ENGINE_COMPARE(ELM_SOFTWARE_X11))
|
||||||
|
@ -1214,7 +1214,7 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
|
||||||
#undef FALLBACK_TRY
|
#undef FALLBACK_TRY
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!win->ee)
|
if (!win->ee)
|
||||||
{
|
{
|
||||||
ERR("Cannot create window.");
|
ERR("Cannot create window.");
|
||||||
|
@ -1307,7 +1307,7 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
|
||||||
Evas_Modifier_Mask mask = evas_key_modifier_mask_get(win->evas, "Control");
|
Evas_Modifier_Mask mask = evas_key_modifier_mask_get(win->evas, "Control");
|
||||||
evas_object_event_callback_add(win->win_obj, EVAS_CALLBACK_KEY_DOWN,
|
evas_object_event_callback_add(win->win_obj, EVAS_CALLBACK_KEY_DOWN,
|
||||||
_debug_key_down, win);
|
_debug_key_down, win);
|
||||||
|
|
||||||
Eina_Bool ret = evas_object_key_grab(win->win_obj, "F12", mask, 0,
|
Eina_Bool ret = evas_object_key_grab(win->win_obj, "F12", mask, 0,
|
||||||
EINA_TRUE);
|
EINA_TRUE);
|
||||||
printf("Key F12 exclusive for dot tree generation. (%d)\n", ret);
|
printf("Key F12 exclusive for dot tree generation. (%d)\n", ret);
|
||||||
|
@ -2493,16 +2493,16 @@ elm_win_illume_command_send(Evas_Object *obj, Elm_Illume_Command command, void *
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the inlined image object handle
|
* Get the inlined image object handle
|
||||||
*
|
*
|
||||||
* When you create a window with elm_win_add() of type ELM_WIN_INLINED_IMAGE,
|
* When you create a window with elm_win_add() of type ELM_WIN_INLINED_IMAGE,
|
||||||
* then the window is in fact an evas image object inlined in the parent
|
* then the window is in fact an evas image object inlined in the parent
|
||||||
* canvas. You can get this object (be careful to not manipulate it as it
|
* canvas. You can get this object (be careful to not manipulate it as it
|
||||||
* is under control of elementary), and use it to do things like get pixel
|
* is under control of elementary), and use it to do things like get pixel
|
||||||
* data, save the image to a file, etc.
|
* data, save the image to a file, etc.
|
||||||
*
|
*
|
||||||
* @param obj The window object to get the inlined image from
|
* @param obj The window object to get the inlined image from
|
||||||
* @return The inlined image object, or NULL if none exists
|
* @return The inlined image object, or NULL if none exists
|
||||||
*
|
*
|
||||||
* @ingroup Win
|
* @ingroup Win
|
||||||
*/
|
*/
|
||||||
EAPI Evas_Object *
|
EAPI Evas_Object *
|
||||||
|
@ -2861,7 +2861,7 @@ elm_win_xwindow_get(const Evas_Object *obj)
|
||||||
Ecore_X_Window xwin = 0;
|
Ecore_X_Window xwin = 0;
|
||||||
Elm_Win *win;
|
Elm_Win *win;
|
||||||
const char *type;
|
const char *type;
|
||||||
|
|
||||||
if (!obj) return 0;
|
if (!obj) return 0;
|
||||||
type = evas_object_type_get(obj);
|
type = evas_object_type_get(obj);
|
||||||
if (!type) return 0;
|
if (!type) return 0;
|
||||||
|
|
Loading…
Reference in New Issue