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

Efl: Add screen_ prefix to all Efl.Screen apis 

This will resolve conflicts between Gfx.size and Screen.size.
This commit is contained in:
Jean-Philippe Andre 2016-06-08 17:25:06 +09:00
parent 5542d6dc48
commit 62c5ebc784
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/efl/interfaces/efl_screen.eo
View File

@ -2,7 +2,7 @@ import eina_types;
interface Efl.Screen {
methods {
@property size {
@property screen_size {
get {
[[Get screen geometry details for the screen that a window is on.]]
}
@ -11,7 +11,7 @@ interface Efl.Screen {
h: int; [[Where to return the height value. May be $null.]]
}
}
@property rotation {
@property screen_rotation {
get {
[[Get the rotation of the screen.
@ -23,7 +23,7 @@ interface Efl.Screen {
rotation: int; [[The degree of the screen.]]
}
}
@property dpi {
@property screen_dpi {
get {
[[Get screen dpi for the screen that a window is on.

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

@ -5049,19 +5049,19 @@ _efl_ui_win_screen_constrain_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
}
EOLIAN static void
_efl_ui_win_efl_screen_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, int *w, int *h)
_efl_ui_win_efl_screen_screen_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, int *w, int *h)
{
ecore_evas_screen_geometry_get(sd->ee, NULL, NULL, w, h);
}
EOLIAN static void
_efl_ui_win_efl_screen_dpi_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, int *xdpi, int *ydpi)
_efl_ui_win_efl_screen_screen_dpi_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, int *xdpi, int *ydpi)
{
ecore_evas_screen_dpi_get(sd->ee, xdpi, ydpi);
}
EOLIAN static int
_efl_ui_win_efl_screen_rotation_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
_efl_ui_win_efl_screen_screen_rotation_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
{
//TODO: query to wm about device's rotation
(void)sd;

6
src/lib/elementary/efl_ui_win.eo
View File

@ -787,9 +787,9 @@ class Efl.Ui.Win (Elm.Widget, Elm.Interface.Atspi.Window,
Efl.Pack.pack;
Efl.Input.State.modifier_enabled.get;
Efl.Input.State.lock_enabled.get;
Efl.Screen.dpi.get;
Efl.Screen.rotation.get;
Efl.Screen.size.get;
Efl.Screen.screen_dpi.get;
Efl.Screen.screen_rotation.get;
Efl.Screen.screen_size.get;
Efl.Gfx.Size.Hint.hint_base.set;
Efl.Gfx.Size.Hint.hint_base.get;
Efl.Gfx.Size.Hint.hint_step.set;