From 831b746a926542c0dfff51456d7a5812c2026b78 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 21 Feb 2019 18:19:33 +0100 Subject: [PATCH] efl.screen: screen_size -> screen_size_in_pixels Summary: also improve docs slightly ref T7590 Reviewers: segfaultxavi Reviewed By: segfaultxavi Subscribers: cedric, #reviewers, #committers Tags: #efl_api Maniphest Tasks: T7590 Differential Revision: https://phab.enlightenment.org/D7965 --- src/lib/efl/interfaces/efl_screen.eo | 8 ++++---- src/lib/elementary/efl_ui_win.c | 2 +- src/lib/elementary/efl_ui_win.eo | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/efl/interfaces/efl_screen.eo b/src/lib/efl/interfaces/efl_screen.eo index ee1696f3d4..3aa06d2348 100644 --- a/src/lib/efl/interfaces/efl_screen.eo +++ b/src/lib/efl/interfaces/efl_screen.eo @@ -4,12 +4,12 @@ interface @beta Efl.Screen { [[Efl screen interface]] methods { - @property screen_size { + @property screen_size_in_pixels { get { - [[Get screen geometry details for the screen that a window is on. + [[Get screen size (in pixels) for the screen. - Note that on some display systems this information is not - available (this could be the case Wayland for instance). + Note that on some display systems this information is not available and + a value of 0x0 will be returned. ]] } values { diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 4a6ec30605..91ee552a8f 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -6833,7 +6833,7 @@ _efl_ui_win_screen_constrain_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) } EOLIAN static Eina_Size2D -_efl_ui_win_efl_screen_screen_size_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) +_efl_ui_win_efl_screen_screen_size_in_pixels_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) { Eina_Size2D sz; ecore_evas_screen_geometry_get(sd->ee, NULL, NULL, &sz.w, &sz.h); diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo index 62499423cd..0f87ba78dc 100644 --- a/src/lib/elementary/efl_ui_win.eo +++ b/src/lib/elementary/efl_ui_win.eo @@ -851,7 +851,7 @@ class @beta Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Ac Efl.Input.State.lock_enabled { get; } Efl.Screen.screen_dpi { get; } Efl.Screen.screen_rotation { get; } - Efl.Screen.screen_size { get; } + Efl.Screen.screen_size_in_pixels { get; } Efl.Gfx.Size_Hint.hint_aspect { set; } Efl.Gfx.Size_Hint.hint_weight { set; } Efl.Gfx.Size_Hint.hint_max { set; }