diff --git a/legacy/elementary/src/bin/test_flip_page.c b/legacy/elementary/src/bin/test_flip_page.c index 9ebb9e3c2d..599858452d 100644 --- a/legacy/elementary/src/bin/test_flip_page.c +++ b/legacy/elementary/src/bin/test_flip_page.c @@ -41,7 +41,7 @@ _slice_update(State *st) Evas_Map *m; Slice *sl; int rad; - + evas_object_geometry_get(st->orig, &x, &y, &w, &h); x1 = st->down_x; y1 = st->down_y; @@ -49,12 +49,12 @@ _slice_update(State *st) y2 = st->y; mx = (x1 + x2) / 2; my = (y1 + y2) / 2; - + if (mx < 0) mx = 0; else if (mx >= w) mx = w - 1; if (my < 0) my = 0; else if (my >= h) my = h - 1; - + if (!st->base) { st->base = evas_object_image_add(evas_object_evas_get(st->win)); @@ -64,7 +64,7 @@ _slice_update(State *st) evas_object_image_source_set(st->base, st->orig); evas_object_show(st->base); } - + m = evas_map_new(4); evas_map_smooth_set(m, 0); @@ -72,7 +72,7 @@ _slice_update(State *st) evas_map_point_coord_set(m, 1, x + mx, y , 0); evas_map_point_coord_set(m, 2, x + mx, y + h, 0); evas_map_point_coord_set(m, 3, x , y + h, 0); - + evas_map_point_image_uv_set(m, 0, 0 , 0); evas_map_point_image_uv_set(m, 1, mx, 0); evas_map_point_image_uv_set(m, 2, mx, h); @@ -82,34 +82,34 @@ _slice_update(State *st) evas_map_point_color_set(m, 1, 255, 255, 255, 255); evas_map_point_color_set(m, 2, 255, 255, 255, 255); evas_map_point_color_set(m, 3, 255, 255, 255, 255); - + /* // FIXME: lighting should be manual with pt 0 and 3 being white and - // 2 and 3 matching the - evas_map_util_3d_lighting(m, + // 2 and 3 matching the + evas_map_util_3d_lighting(m, 0 , 0 , -1000, 255, 255, 255, 20 , 20 , 20); */ evas_map_util_3d_perspective(m, x + (w / 2), y + (h / 2), 0, 512); - + evas_object_map_enable_set(st->base, 1); evas_object_map_set(st->base, m); evas_map_free(m); - + EINA_LIST_FREE(st->slices, sl) { evas_object_del(sl->obj); free(sl); } - + // cylinder radius is width / 8 rad = (w - mx) / 4; if (rad < (w / 16)) rad = (w / 16); if (rad > (w / 8)) rad = w / 8; - + rad = w / 12; - + px = mx; prx = 0; pry = rad; @@ -123,7 +123,7 @@ _slice_update(State *st) evas_object_pass_events_set(sl->obj, 1); evas_object_image_source_set(sl->obj, st->orig); evas_object_show(sl->obj); - + rx = (double)rad * sin((i * M_PI) / RES); ry = (double)rad * cos((i * M_PI) / RES); dx = rx - prx; @@ -137,7 +137,7 @@ _slice_update(State *st) ry = pry + (((ry - pry) * dst) / pdst); } if (dst <= 0) break; - + m = evas_map_new(4); evas_map_smooth_set(m, 0); @@ -145,23 +145,23 @@ _slice_update(State *st) evas_map_point_coord_set(m, 1, x + mx + rx , y , 0 - (rad - ry )); evas_map_point_coord_set(m, 2, x + mx + rx , y + h, 0 - (rad - ry )); evas_map_point_coord_set(m, 3, x + mx + prx, y + h, 0 - (rad - pry)); - + evas_map_point_image_uv_set(m, 0, px , 0); evas_map_point_image_uv_set(m, 1, px + dst, 0); evas_map_point_image_uv_set(m, 2, px + dst, h); evas_map_point_image_uv_set(m, 3, px , h); - + evas_map_point_color_set(m, 0, 255, 255, 255, 255); evas_map_point_color_set(m, 1, 255, 255, 255, 255); evas_map_point_color_set(m, 2, 255, 255, 255, 255); evas_map_point_color_set(m, 3, 255, 255, 255, 255); - + evas_map_util_3d_perspective(m, x + (w / 2), y + (h / 2), 0, 512); - + evas_object_map_enable_set(sl->obj, 1); evas_object_map_set(sl->obj, m); evas_map_free(m); - + prx = rx; pry = ry; px += dst; @@ -176,7 +176,7 @@ _slice_update(State *st) evas_object_pass_events_set(sl->obj, 1); evas_object_image_source_set(sl->obj, st->orig); evas_object_show(sl->obj); - + m = evas_map_new(4); evas_map_smooth_set(m, 0); @@ -184,19 +184,19 @@ _slice_update(State *st) evas_map_point_coord_set(m, 1, x + mx + (px - w) , y , 0 - (rad * 2 )); evas_map_point_coord_set(m, 2, x + mx + (px - w) , y + h, 0 - (rad * 2 )); evas_map_point_coord_set(m, 3, x + mx + prx, y + h, 0 - (rad - pry)); - + evas_map_point_image_uv_set(m, 0, px , 0); evas_map_point_image_uv_set(m, 1, w, 0); evas_map_point_image_uv_set(m, 2, w, h); evas_map_point_image_uv_set(m, 3, px , h); - + evas_map_point_color_set(m, 0, 255, 255, 255, 255); evas_map_point_color_set(m, 1, 255, 255, 255, 255); evas_map_point_color_set(m, 2, 255, 255, 255, 255); evas_map_point_color_set(m, 3, 255, 255, 255, 255); - + evas_map_util_3d_perspective(m, x + (w / 2), y + (h / 2), 0, 512); - + evas_object_map_enable_set(sl->obj, 1); evas_object_map_set(sl->obj, m); evas_map_free(m); @@ -246,7 +246,7 @@ im_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info) Evas_Event_Mouse_Up *ev = event_info; Evas_Object *win = data; Evas_Coord x, y; - + if (ev->button != 1) return; evas_object_geometry_get(obj, &x, &y, NULL, NULL); state.down = 0; @@ -263,7 +263,7 @@ im_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info) Evas_Event_Mouse_Move *ev = event_info; Evas_Object *win = data; Evas_Coord x, y; - + if (!state.down) return; evas_object_geometry_get(obj, &x, &y, NULL, NULL); state.x = ev->cur.canvas.x - x; @@ -292,12 +292,12 @@ test_flip_page(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i im = elm_layout_add(win); snprintf(buf, sizeof(buf), "%s/objects/test.edj", PACKAGE_DATA_DIR); elm_layout_file_set(im, buf, "layout"); -#else +#else im = evas_object_image_filled_add(evas_object_evas_get(win)); snprintf(buf, sizeof(buf), "%s/images/%s", PACKAGE_DATA_DIR, "twofish.jpg"); evas_object_image_file_set(im, buf, NULL); -#endif +#endif evas_object_move(im, 40, 40); evas_object_resize(im, 400, 400); evas_object_show(im); @@ -305,7 +305,7 @@ test_flip_page(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_event_callback_add(im, EVAS_CALLBACK_MOUSE_DOWN, im_down_cb, win); evas_object_event_callback_add(im, EVAS_CALLBACK_MOUSE_UP, im_up_cb, win); evas_object_event_callback_add(im, EVAS_CALLBACK_MOUSE_MOVE, im_move_cb, win); - + evas_object_resize(win, 480, 480); evas_object_show(win); } diff --git a/legacy/elementary/src/bin/test_grid.c b/legacy/elementary/src/bin/test_grid.c index 688968b2ba..d59e30b927 100644 --- a/legacy/elementary/src/bin/test_grid.c +++ b/legacy/elementary/src/bin/test_grid.c @@ -7,7 +7,7 @@ static void _ch_grid(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) { int x, y, w, h; - + elm_grid_pack_get(obj, &x, &y, &w, &h); elm_grid_pack_set(obj, x - 1, y - 1, w + 2, h + 2); } @@ -37,13 +37,13 @@ test_grid(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _ elm_scrolled_entry_single_line_set(en, 1); elm_grid_pack(gd, en, 50, 10, 40, 10); evas_object_show(en); - + en = elm_scrolled_entry_add(win); elm_scrolled_entry_entry_set(en, "Entry text 2"); elm_scrolled_entry_single_line_set(en, 1); elm_grid_pack(gd, en, 60, 20, 30, 10); evas_object_show(en); - + bt = elm_button_add(win); elm_button_label_set(bt, "Button"); elm_grid_pack(gd, bt, 0, 0, 20, 20); @@ -69,7 +69,7 @@ test_grid(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _ elm_grid_pack(gd, bt, 40, 40, 20, 20); evas_object_smart_callback_add(bt, "clicked", _ch_grid, gd); evas_object_show(bt); - + rc = evas_object_rectangle_add(evas_object_evas_get(win)); evas_object_color_set(rc, 128, 0, 0, 128); elm_grid_pack(gd, rc, 40, 70, 20, 10); diff --git a/legacy/elementary/src/lib/elm_config.c b/legacy/elementary/src/lib/elm_config.c index 77861ca3c3..13f722c12a 100644 --- a/legacy/elementary/src/lib/elm_config.c +++ b/legacy/elementary/src/lib/elm_config.c @@ -1402,7 +1402,7 @@ _env_get(void) (!strcasecmp(s, "software-16-x11")) || (!strcasecmp(s, "software_16_x11"))) eina_stringshare_replace(&_elm_config->engine, ELM_SOFTWARE_16_X11); -/* +/* else if ((!strcasecmp(s, "xrender")) || (!strcasecmp(s, "xr")) || (!strcasecmp(s, "xrender-x11")) || diff --git a/legacy/elementary/src/lib/elm_grid.c b/legacy/elementary/src/lib/elm_grid.c index 4dd3ec085c..014861a5ff 100644 --- a/legacy/elementary/src/lib/elm_grid.c +++ b/legacy/elementary/src/lib/elm_grid.c @@ -7,7 +7,7 @@ * The grid is a grid layout widget that lays out a series of children as a * fixed "grid" of widgets using a given percentage of the grid width and * height each using the child object. - * + * * The Grid uses a "Virtual resolution" that is stretched to fill the grid * widgets size itself. The default is 100 x 100, so that means the * position and sizes of children will effectively be percentages (0 to 100) @@ -34,7 +34,7 @@ _del_hook(Evas_Object *obj) free(wd); } -static void +static void _mirrored_set(Evas_Object *obj, Eina_Bool rtl) { Widget_Data *wd = elm_widget_data_get(obj); @@ -101,7 +101,7 @@ elm_grid_size_set(Evas_Object *obj, int w, int h) /** * Get the virtual size of the grid - * + * * @param obj The grid object * @param w Pointer to integer to store the virtual width of the grid * @param h Pointer to integer to store the virtual height of the grid @@ -141,12 +141,12 @@ elm_grid_pack(Evas_Object *obj, Evas_Object *subobj, int x, int y, int w, int h) /** * Unpack a child from a grid object - * + * * @param obj The grid object * @param subobj The child to unpack - * + * * @ingroup Grid - */ + */ EAPI void elm_grid_unpack(Evas_Object *obj, Evas_Object *subobj) { diff --git a/legacy/elementary/src/lib/elm_win.c b/legacy/elementary/src/lib/elm_win.c index d64f0c463c..1fcff8da26 100644 --- a/legacy/elementary/src/lib/elm_win.c +++ b/legacy/elementary/src/lib/elm_win.c @@ -11,7 +11,7 @@ * Engines that may be supported (depending on Evas and Ecore-Evas compilation * setup and modules actually installed at runtime) are (listed in order of * best supported and most likely to be complete and work to lowest quality). - * + * * "x11", "x", "software-x11", "software_x11" * (Software rendering in X11) * "gl", "opengl", "opengl-x11", "opengl_x11" @@ -36,14 +36,14 @@ * (Windows CE rendering via GDI with 16bit software renderer) * "sdl-16", "software-16-sdl", "software_16_sdl" * (Rendering to SDL buffer with 16bit software renderer) - * + * * All engines use a simple string to select the engine to render, EXCEPT * the "shot" engine. This actually encodes the output of the virtual * screenshot and how long to delay in the engine string. The engine string * is encoded in the following way: - * + * * "shot:[delay=XX][:][file=XX]" - * + * * Where options are separated by a ":" char if more than one option is given, * with delay, if provided being the first option and file the last (order * is important). The delay specifies how long to wait after the window is @@ -51,7 +51,7 @@ * output to the file specified by the file option (and then exit). If no * delay is given, the default is 0.5 seconds. If no file is given the * default output file is "out.png". Some examples of using the shot engine: - * + * * ELM_ENGINE="shot:delay=1.0:file=elm_test.png" elementary_test * ELM_ENGINE="shot:file=elm_test2.png" elementary_test * ELM_ENGINE="shot:delay=2.0" elementary_test