dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

efl_ui_win: rename elm_win to efl_ui_win

This commit is contained in:
Ji-Youn Park 2016-06-07 23:11:48 +08:30
parent 1637c21a76
commit 8cf9ee67bd
27 changed files with 399 additions and 302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
po/POTFILES.in
View File

@ -172,7 +172,7 @@ src/lib/elementary/elm_util.c
src/lib/elementary/elm_video.c
src/lib/elementary/elm_web2.c
src/lib/elementary/elm_widget.c
src/lib/elementary/elm_win.c
src/lib/elementary/efl_ui_win.c
src/lib/elementary/els_box.c
src/lib/elementary/els_cursor.c
src/lib/elementary/els_tooltip.c

8
src/Makefile_Elementary.am
View File

@ -95,8 +95,8 @@ elm_public_eolian_files = \
lib/elementary/elm_view_form.eo \
lib/elementary/elm_web.eo \
lib/elementary/elm_widget.eo \
lib/elementary/elm_win.eo \
lib/elementary/elm_win_standard.eo \
lib/elementary/efl_ui_win.eo \
lib/elementary/efl_ui_win_standard.eo \
lib/elementary/elm_widget_item.eo \
lib/elementary/elm_color_item.eo \
lib/elementary/elm_dayselector_item.eo \
@ -665,8 +665,8 @@ lib_elementary_libelementary_la_SOURCES = \
lib/elementary/elm_view_form.c \
lib/elementary/elm_web2.c \
lib/elementary/elm_widget.c \
lib/elementary/elm_win.c \
lib/elementary/elm_win_standard.c \
lib/elementary/efl_ui_win.c \
lib/elementary/efl_ui_win_standard.c \
lib/elementary/elm_helper.c \
lib/elementary/els_box.c \
lib/elementary/els_cursor.c \

2
src/lib/elementary/Elementary.h.in
View File

@ -273,6 +273,8 @@ EAPI extern Elm_Version *elm_version;
# include <efl_ui_box_flow.eo.h>
# include <efl_ui_grid.eo.h>
# include <efl_ui_image.eo.h>
# include <efl_ui_win.eo.h>
# include <efl_ui_win_standard.eo.h>
#endif
/* include deprecated calls last of all */

8
src/lib/elementary/Makefile.am
View File

@ -102,8 +102,8 @@ elm_eolian_files = \
elm_view_form.eo \
elm_web.eo \
elm_widget.eo \
elm_win.eo \
elm_win_standard.eo \
efl_ui_win.eo \
efl_ui_win_standard.eo \
elm_widget_item.eo \
elm_color_item.eo \
elm_dayselector_item.eo \
@ -616,8 +616,8 @@ libelementary_la_SOURCES = \
elm_view_form.c \
elm_web2.c \
elm_widget.c \
elm_win.c \
elm_win_standard.c \
efl_ui_win.c \
efl_ui_win_standard.c \
elm_helper.c \
els_box.c \
els_cursor.c \

422
src/lib/elementary/elm_win.c → src/lib/elementary/efl_ui_win.c
View File

File diff suppressed because it is too large Load Diff

59
src/lib/elementary/elm_win.eo → src/lib/elementary/efl_ui_win.eo
View File

@ -1,8 +1,5 @@
/* FIXME: Shouldn't be here. */
type Ecore_Evas: __undefined_type;
type Ecore_Window: __undefined_type;
enum Elm.Win.Type
enum Efl.Ui.Win.Type
{
[[Defines the types of window that can be created
@ -12,8 +9,7 @@ enum Elm.Win.Type
Currently, only the X11 backed engines use them.
]]
legacy: elm_win;
legacy: efl_ui_win;
unknown = -1,
basic, [[A normal window. Indicates a normal, top-level window. Almost every
@ -65,15 +61,14 @@ enum Elm.Win.Type
]]
}
enum Elm.Win.Keyboard_Mode
enum Efl.Ui.Win.Keyboard_Mode
{
[[The different layouts that can be requested for the virtual keyboard.
When the application window is being managed by Illume, it may request
any of the following layouts for the virtual keyboard.
]]
legacy: elm_win_keyboard;
legacy: efl_ui_win_keyboard;
unknown, [[Unknown keyboard state]]
off, [[Request to deactivate the keyboard]]
@ -93,10 +88,10 @@ enum Elm.Win.Keyboard_Mode
j2me [[J2ME keyboard layout]]
}
enum Elm.Win.Indicator_Type
enum Efl.Ui.Win.Indicator_Type
{
[[Defines the type indicator that can be shown]]
legacy: elm_win_indicator;
legacy: efl_ui_win_indicator;
type_unknown, [[Unknown indicator type]]
bg_opaque, [[The icon of indicator is opaque, the background of indicator is also opaque.
@ -111,12 +106,12 @@ enum Elm.Win.Indicator_Type
/**
*/
enum Elm.Win.Keygrab_Mode
enum Efl.Ui.Win.Keygrab_Mode
{
[[Define the keygrab modes of window. A window may send commands to the
Keyrouter according this mode, and perform different actions.]]
legacy: elm_win_keygrab;
legacy: efl_ui_win_keygrab;
unknown = 0, [[Unknown keygrab mode]]
shared = (1 << 8), [[Getting the grabbed-key together with the other client
windows]]
@ -130,30 +125,32 @@ enum Elm.Win.Keygrab_Mode
window]]
}
enum Elm.Win.Modal_Mode
enum Efl.Ui.Win.Modal_Mode
{
[[Defines the mode of a modal window]]
legacy: efl_ui_win_modal;
none, [[The window is not modal window.]]
modal [[The window is modal window.]]
}
enum Elm.Win.Urgent_Mode
enum Efl.Ui.Win.Urgent_Mode
{
[[Defines the mode of a urgent window.]]
legacy: efl_ui_win_urgent;
none, [[The window is not a urgent window.]]
urgent [[The window is a urgent window.]]
}
class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window,
class Efl.Ui.Win (Elm.Widget, Elm.Interface.Atspi.Window,
Elm.Interface.Atspi_Widget_Action, Efl.Pack,
Efl.Input.State, Efl.Input.Interface, Efl.Screen,
Efl.Gfx.Size.Hint, Efl.Text)
Efl.Gfx.Size.Hint)
{
legacy_prefix: elm_win;
eo_prefix: elm_obj_win;
event_prefix: elm_win;
eo_prefix: efl_ui_win;
event_prefix: efl_ui_win;
methods {
@property indicator_enabled {
set {
@ -167,9 +164,11 @@ class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window,
But like TV, default is to disable the indicator.
Sets the indicator enable of the window.]]
legacy: null;
}
get {
[[Get the indicator enable of the window.]]
legacy: null;
}
values {
enabled: bool; [[If true, the indicator is enabled,
@ -179,12 +178,14 @@ class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window,
@property indicator_type {
set {
[[Sets the indicator type of the window.]]
legacy: null;
}
get {
[[Get the indicator type of the window.]]
legacy: null;
}
values {
type: Elm.Win.Indicator_Type; [[The type, one of #Elm_Win_Indicator_Type.]]
type: Efl.Ui.Win.Indicator_Type; [[The type, one of #Efl_Ui_Win_Indicator_Type.]]
}
}
@property keyboard_mode {
@ -195,7 +196,7 @@ class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window,
[[Get the keyboard mode of the window.]]
}
values {
mode: Elm.Win.Keyboard_Mode; [[The mode, one of #Elm_Win_Keyboard_Mode.]]
mode: Efl.Ui.Win.Keyboard_Mode; [[The mode, one of #Efl_Ui_Win_Keyboard_Mode.]]
}
}
@property wm_available_rotations {
@ -473,8 +474,8 @@ class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window,
legacy: null;
}
values {
urgent: Elm.Win.Urgent_Mode;
[[The mode of a urgent window, one of #Elm_Win_Urgent_Mode.]]
urgent: Efl.Ui.Win.Urgent_Mode;
[[The mode of a urgent window, one of #Efl_Ui_Win_Urgent_Mode.]]
}
}
@property modal {
@ -487,7 +488,7 @@ class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window,
legacy: null;
}
values {
modal: Elm.Win.Modal_Mode; [[The mode of a window, one of #Elm_Win_Modal_Mode.]]
modal: Efl.Ui.Win.Modal_Mode; [[The mode of a window, one of #Efl_Ui_Win_Modal_Mode.]]
}
}
@property noblank {
@ -564,13 +565,12 @@ class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window,
*/
set {
[[Can only be used at creation time, within \@ref eo_add.]]
legacy: null;
}
values {
name: string @nullable;
}
}
@property type {
@property type { /* FIXME: before finalize */
[[The type of the window.
It is a hint of how the Window Manager should handle it.
@ -592,9 +592,10 @@ class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window,
}
get {
[[If the object is not window object, return #ELM_WIN_UNKNOWN.]]
legacy: null;
}
values {
type: Elm.Win.Type(Elm.Win.Type.unknown);
type: Efl.Ui.Win.Type(Efl.Ui.Win.Type.unknown);
}
}
@property available_profiles {
@ -716,7 +717,7 @@ class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window,
@in modifiers: Evas.Modifier_Mask; [[This is for the keymask feature. Currently this feature is not supported.]]
@in not_modifiers: Evas.Modifier_Mask; [[This is for the keymask feature. Currently this feature is not supported.]]
@in proirity: int; [[This is for the priority of keygrab. Currently this feature is not supported.]]
@in grab_mode: Elm.Win.Keygrab_Mode; [[According to the grabmode, it can grab key differently.]]
@in grab_mode: Efl.Ui.Win.Keygrab_Mode; [[According to the grabmode, it can grab key differently.]]
}
}
keygrab_unset {
@ -804,8 +805,6 @@ class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window,
Efl.Gfx.Size.Hint.base.get;
Efl.Gfx.Size.Hint.step.set;
Efl.Gfx.Size.Hint.step.get;
Efl.Text.text.set;
Efl.Text.text.get;
}
constructors {
.name;

6
src/lib/elementary/elm_win_standard.c → src/lib/elementary/efl_ui_win_standard.c
View File

@ -10,10 +10,10 @@
#include "elm_priv.h"
#define MY_CLASS ELM_WIN_STANDARD_CLASS
#define MY_CLASS EFL_UI_WIN_STANDARD_CLASS
EOLIAN static Eo *
_elm_win_standard_eo_base_finalize(Eo *obj, void *pd EINA_UNUSED)
_efl_ui_win_standard_eo_base_finalize(Eo *obj, void *pd EINA_UNUSED)
{
obj = eo_finalize(eo_super(obj, MY_CLASS));
if (!obj)
@ -33,4 +33,4 @@ _elm_win_standard_eo_base_finalize(Eo *obj, void *pd EINA_UNUSED)
return obj;
}
#include "elm_win_standard.eo.c"
#include "efl_ui_win_standard.eo.c"

2
src/lib/elementary/elm_win_standard.eo → src/lib/elementary/efl_ui_win_standard.eo
View File

@ -1,4 +1,4 @@
class Elm.Win.Standard (Elm.Win)
class Efl.Ui.Win.Standard (Efl.Ui.Win)
{
data: null;
implements {

4
src/lib/elementary/elc_ctxpopup.c
View File

@ -228,7 +228,7 @@ _base_geometry_calc(Evas_Object *obj,
evas_object_geometry_get
(sd->parent, &hover_area.x, &hover_area.y, &hover_area.w,
&hover_area.h);
if (sd->parent && eo_isa(sd->parent, ELM_WIN_CLASS))
if (sd->parent && eo_isa(sd->parent, EFL_UI_WIN_CLASS))
hover_area.x = hover_area.y = 0;
evas_object_geometry_get(obj, &pos.x, &pos.y, NULL, NULL);
@ -1204,7 +1204,7 @@ _elm_ctxpopup_hover_parent_set(Eo *obj, Elm_Ctxpopup_Data *sd, Evas_Object *pare
//Update Background
evas_object_geometry_get(parent, &x, &y, &w, &h);
if (parent && eo_isa(parent, ELM_WIN_CLASS))
if (parent && eo_isa(parent, EFL_UI_WIN_CLASS))
x = y = 0;
evas_object_move(sd->bg, x, y);
evas_object_resize(sd->bg, w, h);

4
src/lib/elementary/elc_fileselector_button.c
View File

@ -138,7 +138,7 @@ _new_window_add(Elm_Fileselector_Button_Data *sd)
elm_win_title_set(win, sd->window_title);
elm_win_autodel_set(win, EINA_TRUE);
eo_event_callback_add
(win, ELM_WIN_EVENT_DELETE_REQUEST, _selection_done, sd);
(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _selection_done, sd);
bg = elm_bg_add(win);
evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@ -152,7 +152,7 @@ _new_window_add(Elm_Fileselector_Button_Data *sd)
static Evas_Object *
_parent_win_get(Evas_Object *obj)
{
while (!eo_isa(obj, ELM_WIN_CLASS))
while (!eo_isa(obj, EFL_UI_WIN_CLASS))
obj = elm_object_parent_widget_get(obj);
return obj;

2
src/lib/elementary/elc_hoversel.c
View File

@ -272,7 +272,7 @@ _resizing_eval(Evas_Object *obj, Elm_Hoversel_Data *sd)
}
evas_object_geometry_get(sd->hover_parent, &x, &y, &w, &h);
if (eo_isa(sd->hover_parent, ELM_WIN_CLASS))
if (eo_isa(sd->hover_parent, EFL_UI_WIN_CLASS))
{
x = 0;
y = 0;

4
src/lib/elementary/elc_popup.c
View File

@ -1576,7 +1576,7 @@ _parent_geom_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_i
evas_object_geometry_get(obj, &x, &y, &w, &h);
if (eo_isa(obj, ELM_WIN_CLASS))
if (eo_isa(obj, EFL_UI_WIN_CLASS))
{
x = 0;
y = 0;
@ -1592,7 +1592,7 @@ _elm_popup_elm_widget_widget_parent_set(Eo *obj, Elm_Popup_Data *sd, Evas_Object
Evas_Coord x, y, w, h;
evas_object_geometry_get(parent, &x, &y, &w, &h);
if (eo_isa(parent, ELM_WIN_CLASS))
if (eo_isa(parent, EFL_UI_WIN_CLASS))
{
x = 0;
y = 0;

24
src/lib/elementary/elm_cnp.c
View File

@ -366,7 +366,7 @@ _dropable_coords_adjust(Dropable *dropable, Evas_Coord *x, Evas_Coord *y)
if (elm_widget_is(dropable->obj))
{
win = elm_widget_top_get(dropable->obj);
if (win && eo_isa(win, ELM_WIN_CLASS))
if (win && eo_isa(win, EFL_UI_WIN_CLASS))
{
Evas_Coord x2, y2;
int rot = elm_win_rotation_get(win);
@ -1817,8 +1817,8 @@ _x11_drag_mouse_up(void *data, int etype EINA_UNUSED, void *event)
if (elm_widget_is(dragwidget))
{
Evas_Object *win = elm_widget_top_get(dragwidget);
if (win && eo_isa(win, ELM_WIN_CLASS))
eo_event_callback_del(win, ELM_WIN_EVENT_ROTATION_CHANGED, _x11_win_rotation_changed_cb, dragwin);
if (win && eo_isa(win, EFL_UI_WIN_CLASS))
eo_event_callback_del(win, EFL_UI_WIN_EVENT_ROTATION_CHANGED, _x11_win_rotation_changed_cb, dragwin);
}
}
@ -1883,7 +1883,7 @@ _x11_elm_widget_xwin_get(const Evas_Object *obj)
par = elm_widget_parent_widget_get(obj);
if (par) top = elm_widget_top_get(par);
}
if (top && (eo_isa(top, ELM_WIN_CLASS)))
if (top && (eo_isa(top, EFL_UI_WIN_CLASS)))
xwin = elm_win_xwindow_get(top);
}
if (!xwin)
@ -2271,10 +2271,10 @@ _x11_elm_drag_start(Evas_Object *obj, Elm_Sel_Format format, const char *data,
if (elm_widget_is(obj))
{
Evas_Object *win = elm_widget_top_get(obj);
if (win && eo_isa(win, ELM_WIN_CLASS))
if (win && eo_isa(win, EFL_UI_WIN_CLASS))
{
elm_win_rotation_set(dragwin, elm_win_rotation_get(win));
eo_event_callback_add(win, ELM_WIN_EVENT_ROTATION_CHANGED, _x11_win_rotation_changed_cb, dragwin);
eo_event_callback_add(win, EFL_UI_WIN_EVENT_ROTATION_CHANGED, _x11_win_rotation_changed_cb, dragwin);
}
}
@ -3418,7 +3418,7 @@ _wl_elm_drag_start(Evas_Object *obj, Elm_Sel_Format format, const char *data,
top = elm_widget_top_get(obj);
if (!top) top = elm_widget_top_get(elm_widget_parent_widget_get(obj));
if (top && (eo_isa(top, ELM_WIN_CLASS)))
if (top && (eo_isa(top, EFL_UI_WIN_CLASS)))
parent = elm_win_wl_window_get(top);
}
if (!parent)
@ -3913,7 +3913,7 @@ _wl_elm_widget_window_get(const Evas_Object *obj)
{
top = elm_widget_top_get(obj);
if (!top) top = elm_widget_top_get(elm_widget_parent_widget_get(obj));
if (top && (eo_isa(top, ELM_WIN_CLASS)))
if (top && (eo_isa(top, EFL_UI_WIN_CLASS)))
win = elm_win_wl_window_get(top);
}
if (!win)
@ -3987,7 +3987,7 @@ _cocoa_elm_widget_cocoa_window_get(const Evas_Object *obj)
par = elm_widget_parent_widget_get(obj);
if (par) top = elm_widget_top_get(par);
}
if ((top) && (eo_isa(top, ELM_WIN_CLASS)))
if ((top) && (eo_isa(top, EFL_UI_WIN_CLASS)))
win = elm_win_cocoa_window_get(top);
}
if (!win)
@ -4537,7 +4537,7 @@ _win32_elm_widget_window_get(const Evas_Object *obj)
par = elm_widget_parent_widget_get(obj);
if (par) top = elm_widget_top_get(par);
}
if (top && (eo_isa(top, ELM_WIN_CLASS)))
if (top && (eo_isa(top, EFL_UI_WIN_CLASS)))
win = elm_win_win32_window_get(top);
}
@ -5581,8 +5581,8 @@ elm_drag_cancel(Evas_Object *obj)
if (elm_widget_is(dragwidget))
{
Evas_Object *win = elm_widget_top_get(dragwidget);
if (win && eo_isa(win, ELM_WIN_CLASS))
eo_event_callback_del(win, ELM_WIN_EVENT_ROTATION_CHANGED, _x11_win_rotation_changed_cb, dragwin);
if (win && eo_isa(win, EFL_UI_WIN_CLASS))
eo_event_callback_del(win, EFL_UI_WIN_EVENT_ROTATION_CHANGED, _x11_win_rotation_changed_cb, dragwin);
}
}
goto end;

8
src/lib/elementary/elm_conform.c
View File

@ -952,8 +952,8 @@ _elm_conformant_evas_object_smart_del(Eo *obj, Elm_Conformant_Data *sd)
evas_object_data_set(sd->win, "\377 elm,conformant", NULL);
eo_event_callback_del(sd->win, ELM_WIN_EVENT_INDICATOR_PROP_CHANGED, _on_indicator_mode_changed, obj);
eo_event_callback_del(sd->win, ELM_WIN_EVENT_ROTATION_CHANGED, _on_rotation_changed, obj);
eo_event_callback_del(sd->win, EFL_UI_WIN_EVENT_INDICATOR_PROP_CHANGED, _on_indicator_mode_changed, obj);
eo_event_callback_del(sd->win, EFL_UI_WIN_EVENT_ROTATION_CHANGED, _on_rotation_changed, obj);
evas_obj_smart_del(eo_super(obj, MY_CLASS));
}
@ -1014,8 +1014,8 @@ _elm_conformant_eo_base_constructor(Eo *obj, Elm_Conformant_Data *sd)
sd->rot = elm_win_rotation_get(sd->win);
evas_object_data_set(sd->win, "\377 elm,conformant", obj);
eo_event_callback_add(sd->win, ELM_WIN_EVENT_INDICATOR_PROP_CHANGED, _on_indicator_mode_changed, obj);
eo_event_callback_add(sd->win, ELM_WIN_EVENT_ROTATION_CHANGED, _on_rotation_changed, obj);
eo_event_callback_add(sd->win, EFL_UI_WIN_EVENT_INDICATOR_PROP_CHANGED, _on_indicator_mode_changed, obj);
eo_event_callback_add(sd->win, EFL_UI_WIN_EVENT_ROTATION_CHANGED, _on_rotation_changed, obj);
return obj;
}

6
src/lib/elementary/elm_entry.c
View File

@ -1224,7 +1224,7 @@ _elm_entry_elm_widget_on_focus(Eo *obj, Elm_Entry_Data *sd, Elm_Object_Item *ite
if (!sd->editable) return EINA_FALSE;
top = elm_widget_top_get(obj);
if (top && eo_isa(top, ELM_WIN_CLASS))
if (top && eo_isa(top, EFL_UI_WIN_CLASS))
top_is_win = EINA_TRUE;
if (elm_widget_focus_get(obj))
@ -1827,7 +1827,7 @@ _magnifier_move(void *data)
// keep magnifier inside window
top = elm_widget_top_get(data);
if (top && eo_isa(top, ELM_WIN_CLASS))
if (top && eo_isa(top, EFL_UI_WIN_CLASS))
{
Evas_Coord wh, ww;
evas_object_geometry_get(top, NULL, NULL, &ww, &wh);
@ -1994,7 +1994,7 @@ _mouse_up_cb(void *data,
top = elm_widget_top_get(data);
if (top)
{
if (eo_isa(top, ELM_WIN_CLASS))
if (eo_isa(top, EFL_UI_WIN_CLASS))
top_is_win = EINA_TRUE;
if (top_is_win && sd->input_panel_enable && sd->input_panel_show_on_demand &&

4
src/lib/elementary/elm_hover.c
View File

@ -139,7 +139,7 @@ _elm_hover_left_space_calc(Elm_Hover_Data *sd,
if (sd->parent)
{
evas_object_geometry_get(sd->parent, &x, &y, &w, &h);
if (eo_isa(sd->parent, ELM_WIN_CLASS))
if (eo_isa(sd->parent, EFL_UI_WIN_CLASS))
{
x = 0;
y = 0;
@ -318,7 +318,7 @@ _elm_hover_elm_layout_sizing_eval(Eo *obj, Elm_Hover_Data *sd)
if (sd->parent)
{
evas_object_geometry_get(sd->parent, &x, &y, &w, &h);
if (eo_isa(sd->parent, ELM_WIN_CLASS))
if (eo_isa(sd->parent, EFL_UI_WIN_CLASS))
{
x = 0;
y = 0;

2
src/lib/elementary/elm_inwin.c
View File

@ -109,7 +109,7 @@ _elm_inwin_eo_base_constructor(Eo *obj, void *_pd EINA_UNUSED)
parent = eo_parent_get(obj);
if (parent && !eo_isa(parent, ELM_WIN_CLASS))
if (parent && !eo_isa(parent, EFL_UI_WIN_CLASS))
{
ERR("Failed");
return NULL;

2
src/lib/elementary/elm_main.c
View File

@ -1386,7 +1386,7 @@ elm_object_focus_set(Evas_Object *obj,
if (focus == elm_widget_focus_get(obj)) return;
// ugly, but, special case for inlined windows
if (eo_isa(obj, ELM_WIN_CLASS))
if (eo_isa(obj, EFL_UI_WIN_CLASS))
{
Evas_Object *inlined = elm_win_inlined_image_object_get(obj);

4
src/lib/elementary/elm_menu.c
View File

@ -119,7 +119,7 @@ _submenu_sizing_eval(Elm_Menu_Item_Data *parent_it)
evas_object_geometry_get(VIEW(parent_it), &x2, &y2, &w2, &h2);
evas_object_geometry_get(parent_it->submenu.bx, &bx, &by, &bw, &bh);
evas_object_geometry_get(sd->parent, &px, &py, &pw, &ph);
if (eo_isa(sd->parent, ELM_WIN_CLASS))
if (eo_isa(sd->parent, EFL_UI_WIN_CLASS))
{
px = 0;
py = 0;
@ -185,7 +185,7 @@ _sizing_eval(Evas_Object *obj)
evas_object_geometry_get(sd->location, NULL, NULL, &w_p, &h_p);
evas_object_geometry_get(sd->parent, &x2, &y2, &w2, &h2);
if (eo_isa(sd->parent, ELM_WIN_CLASS))
if (eo_isa(sd->parent, EFL_UI_WIN_CLASS))
{
x2 = 0;
y2 = 0;

2
src/lib/elementary/elm_notify.c
View File

@ -131,7 +131,7 @@ _sizing_eval(Evas_Object *obj)
if (!sd->parent) return;
evas_object_geometry_get(sd->parent, &x, &y, &w, &h);
if (eo_isa(sd->parent, ELM_WIN_CLASS))
if (eo_isa(sd->parent, EFL_UI_WIN_CLASS))
{
x = 0;
y = 0;

12
src/lib/elementary/elm_widget.c
View File

@ -164,7 +164,7 @@ _elm_widget_focus_highlight_start(const Evas_Object *obj)
{
Evas_Object *top = elm_widget_top_get(obj);
if (top && eo_isa(top, ELM_WIN_CLASS))
if (top && eo_isa(top, EFL_UI_WIN_CLASS))
_elm_win_focus_highlight_start(top);
}
@ -173,7 +173,7 @@ _elm_widget_focus_highlight_object_get(const Evas_Object *obj)
{
Evas_Object *top = elm_widget_top_get(obj);
if (top && eo_isa(top, ELM_WIN_CLASS))
if (top && eo_isa(top, EFL_UI_WIN_CLASS))
return _elm_win_focus_highlight_object_get(top);
return NULL;
}
@ -183,7 +183,7 @@ elm_widget_focus_highlight_enabled_get(const Evas_Object *obj)
{
const Evas_Object *win = elm_widget_top_get(obj);
if (win && eo_isa(win, ELM_WIN_CLASS))
if (win && eo_isa(win, EFL_UI_WIN_CLASS))
return elm_win_focus_highlight_enabled_get(win);
return EINA_FALSE;
}
@ -1546,7 +1546,7 @@ _elm_widget_highlight_in_theme_update(Eo *obj)
{
Evas_Object *top = elm_widget_top_get(obj);
if (top && eo_isa(top, ELM_WIN_CLASS))
if (top && eo_isa(top, EFL_UI_WIN_CLASS))
{
_elm_win_focus_highlight_in_theme_update(
top, elm_widget_highlight_in_theme_get(obj));
@ -3013,7 +3013,7 @@ void
_elm_widget_focus_auto_show(Evas_Object *obj)
{
Evas_Object *top = elm_widget_top_get(obj);
if (top && eo_isa(top, ELM_WIN_CLASS)) _elm_win_focus_auto_show(top);
if (top && eo_isa(top, EFL_UI_WIN_CLASS)) _elm_win_focus_auto_show(top);
}
void
@ -4004,7 +4004,7 @@ _elm_widget_focus_mouse_up_handle(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSE
if (!obj) return;
if (!_is_focusable(obj)) return;
top = elm_widget_top_get(obj);
if (top && eo_isa(top, ELM_WIN_CLASS)) _elm_win_focus_auto_hide(top);
if (top && eo_isa(top, EFL_UI_WIN_CLASS)) _elm_win_focus_auto_hide(top);
elm_widget_focus_steal(obj, NULL);
}

2
src/lib/elementary/elm_win.h
View File

@ -105,7 +105,7 @@
#include <elm_win_common.h>
#ifdef EFL_EO_API_SUPPORT
#include <elm_win_eo.h>
#include <efl_ui_win.eo.h>
#endif
#ifndef EFL_NOLEGACY_API_SUPPORT
#include <elm_win_legacy.h>

2
src/lib/elementary/elm_win_eo.h
View File

@ -4,7 +4,7 @@
* @{
*/
#include "elm_win.eo.h"
#include "efl_ui_win.eo.h"
/**
* @}

104
src/lib/elementary/elm_win_legacy.h
View File

@ -1,4 +1,4 @@
#include "elm_win.eo.legacy.h"
#include "efl_ui_win.eo.legacy.h"
/**
* @brief In some environments, like phones, you may have an indicator that
@ -50,6 +50,54 @@ typedef enum
ELM_ILLUME_COMMAND_CLOSE /** Closes the currently active window */
} Elm_Illume_Command;
typedef Efl_Ui_Win_Type Elm_Win_Type;
#define ELM_WIN_UNKNOWN EFL_UI_WIN_UNKNOWN
#define ELM_WIN_BASIC EFL_UI_WIN_BASIC
#define ELM_WIN_DIALOG_BASIC EFL_UI_WIN_DIALOG_BASIC
#define ELM_WIN_DESKTOP EFL_UI_WIN_DESKTOP
#define ELM_WIN_DOCK EFL_UI_WIN_DOCK
#define ELM_WIN_TOOLBAR EFL_UI_WIN_TOOLBAR
#define ELM_WIN_MENU EFL_UI_WIN_MENU
#define ELM_WIN_UTILITY EFL_UI_WIN_UTILITY
#define ELM_WIN_SPLASH EFL_UI_WIN_SPLASH
#define ELM_WIN_DROPDOWN_MENU EFL_UI_WIN_DROPDOWN_MENU
#define ELM_WIN_POPUP_MENU EFL_UI_WIN_POPUP_MENU
#define ELM_WIN_TOOLTIP EFL_UI_WIN_TOOLTIP
#define ELM_WIN_NOTIFICATION EFL_UI_WIN_NOTIFICATION
#define ELM_WIN_COMBO EFL_UI_WIN_COMBO
#define ELM_WIN_DND EFL_UI_WIN_DND
#define ELM_WIN_INLINED_IMAGE EFL_UI_WIN_INLINED_IMAGE
#define ELM_WIN_SOCKET_IMAGE EFL_UI_WIN_SOCKET_IMAGE
#define ELM_WIN_FAKE EFL_UI_WIN_FAKE
typedef Efl_Ui_Win_Keyboard_Mode Elm_Win_Keyboard_Mode;
#define ELM_WIN_KEYBOARD_UNKNOWN EFL_UI_WIN_KEYBOARD_UNKNOWN
#define ELM_WIN_KEYBOARD_OFF EFL_UI_WIN_KEYBOARD_OFF
#define ELM_WIN_KEYBOARD_ON EFL_UI_WIN_KEYBOARD_ON
#define ELM_WIN_KEYBOARD_ALPHA EFL_UI_WIN_KEYBOARD_ALPHA
#define ELM_WIN_KEYBOARD_NUMERIC EFL_UI_WIN_KEYBOARD_NUMERIC
#define ELM_WIN_KEYBOARD_PIN EFL_UI_WIN_KEYBOARD_PIN
#define ELM_WIN_KEYBOARD_PHONE_NUMBER EFL_UI_WIN_KEYBOARD_PHONE_NUMBER
#define ELM_WIN_KEYBOARD_HEX EFL_UI_WIN_KEYBOARD_HEX
#define ELM_WIN_KEYBOARD_TERMINAL EFL_UI_WIN_KEYBOARD_TERMINAL
#define ELM_WIN_KEYBOARD_PASSWORD EFL_UI_WIN_KEYBOARD_PASSWORD
#define ELM_WIN_KEYBOARD_IP EFL_UI_WIN_KEYBOARD_IP
#define ELM_WIN_KEYBOARD_HOST EFL_UI_WIN_KEYBOARD_HOST
#define ELM_WIN_KEYBOARD_FILE EFL_UI_WIN_KEYBOARD_FILE
#define ELM_WIN_KEYBOARD_URL EFL_UI_WIN_KEYBOARD_URL
#define ELM_WIN_KEYBOARD_KEYPAD EFL_UI_WIN_KEYBOARD_KEYPAD
#define ELM_WIN_KEYBOARD_J2ME EFL_UI_WIN_KEYBOARD_J2ME
typedef Efl_Ui_Win_Keygrab_Mode Elm_Win_Keygrab_Mode;
#define ELM_WIN_KEYGRAB_UNKNOWN EFL_UI_WIN_KEYGRAB_UNKNOWN
#define ELM_WIN_KEYGRAB_SHARED EFL_UI_WIN_KEYGRAB_SHARED
#define ELM_WIN_KEYGRAB_TOPMOST EFL_UI_WIN_KEYGRAB_TOPMOST
#define ELM_WIN_KEYGRAB_EXCLUSIVE EFL_UI_WIN_KEYGRAB_EXCLUSIVE
#define ELM_WIN_KEYGRAB_OVERRIDE_EXCLUSIVE EFL_UI_WIN_KEYGRAB_OVERRIDE_EXCLUSIVE
/**
* Adds a window object. If this is the first window created, pass NULL as
* @p parent.
@ -68,6 +116,8 @@ typedef enum
*/
EAPI Evas_Object *elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type);
typedef Evas_Object Elm_Win;
/**
* Creates a fake window object using a pre-existing canvas.
*
@ -1004,3 +1054,55 @@ EAPI Ecore_Window elm_win_window_id_get(const Evas_Object *obj);
*/
EAPI Evas_Object *elm_win_main_menu_get(Evas_Object *obj);
/**
* @brief Sets the keyboard mode of the window.
*
* @param[in] mode The mode, one of #Elm_Win_Keyboard_Mode.
*
* @ingroup Elm_Win
*/
EAPI void elm_win_keyboard_mode_set(Elm_Win *obj, Elm_Win_Keyboard_Mode mode);
/**
* @brief Get the keyboard mode of the window.
*
* @return The mode, one of #Elm_Win_Keyboard_Mode.
*
* @ingroup Elm_Win
*/
EAPI Elm_Win_Keyboard_Mode elm_win_keyboard_mode_get(const Elm_Win *obj);
/**
* @brief The type of the window.
*
* It is a hint of how the Window Manager should handle it.
*
* The window type is a constructing property that need to be set at creation
* within @ref eo_add.
*
* @note Once set, it can NOT be modified afterward.
*
* Can only be used at creation time, within @ref eo_add.
*
* @param[in] type
*
* @ingroup Elm_Win
*/
EAPI void elm_win_type_set(Elm_Win *obj, Elm_Win_Type type);
/**
* @brief The type of the window.
*
* It is a hint of how the Window Manager should handle it.
*
* The window type is a constructing property that need to be set at creation
* within @ref eo_add.
*
* @note Once set, it can NOT be modified afterward.
*
* If the object is not window object, return #ELM_WIN_UNKNOWN.
*
* @ingroup Elm_Win
*/
EAPI Elm_Win_Type elm_win_type_get(const Elm_Win *obj);

2
src/lib/elementary/elm_win_standard.h
View File

@ -1,3 +1,3 @@
#ifdef EFL_EO_API_SUPPORT
#include <elm_win_standard.eo.h>
#include <efl_ui_win_standard.eo.h>
#endif

2
src/lib/elementary/els_cursor.c
View File

@ -440,7 +440,7 @@ _elm_cursor_cur_set(Elm_Cursor *cur)
Evas_Object *top;
top = elm_widget_top_get(cur->owner);
if ((top) && (eo_isa(top, ELM_WIN_CLASS)))
if ((top) && (eo_isa(top, EFL_UI_WIN_CLASS)))
{
#ifdef HAVE_ELEMENTARY_X
cur->x.win = elm_win_xwindow_get(top);

2
src/lib/elementary/els_tooltip.c
View File

@ -504,7 +504,7 @@ _elm_tooltip_reconfigure(Elm_Tooltip *tt)
/* win reports its screen position for x/y;
* reset to 0 since we expect canvas coords here
*/
if (eo_isa(tt->eventarea, ELM_WIN_CLASS))
if (eo_isa(tt->eventarea, EFL_UI_WIN_CLASS))
ox = oy = 0;
TTDBG("EVENTAREA: ox=%d,oy=%d,ow=%d,oh=%d\n", ox, oy, ow, oh);