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

efl_ui/image: implement efl.gfx.arrangement content_align to replace align prop 

this is effectively the same thing. no uses of this functionality exist anywhere

ref T7873

Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de>
Differential Revision: https://phab.enlightenment.org/D9688
This commit is contained in:
Mike Blumenkrantz 2019-08-21 12:59:30 -04:00 committed by Marcel Hollerbach
parent 7442ae7092
commit 81183e0423
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1603,7 +1603,7 @@ _efl_ui_image_scalable_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd, Ein
}
EOLIAN static void
_efl_ui_image_align_set(Eo *obj, Efl_Ui_Image_Data *sd, double align_x, double align_y)
_efl_ui_image_efl_gfx_arrangement_content_align_set(Eo *obj, Efl_Ui_Image_Data *sd, double align_x, double align_y)
{
if (align_x > 1.0)
align_x = 1.0;
@ -1624,7 +1624,7 @@ _efl_ui_image_align_set(Eo *obj, Efl_Ui_Image_Data *sd, double align_x, double a
}
EOLIAN static void
_efl_ui_image_align_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd, double *align_x, double *align_y)
_efl_ui_image_efl_gfx_arrangement_content_align_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd, double *align_x, double *align_y)
{
if (align_x) *align_x = sd->align_x;
if (align_y) *align_y = sd->align_y;

13
src/lib/elementary/efl_ui_image.eo
View File

@ -20,8 +20,8 @@ class @beta Efl.Ui.Image extends Efl.Ui.Widget implements Efl.Input.Clickable, E
Efl.File, Efl.Gfx.Image, Efl.Gfx.Image_Load_Controller, Efl.Player, Efl.Gfx.View,
Efl.Access.Component, Efl.Access.Widget.Action, Efl.Gfx.Color,
Efl.Gfx.Image_Orientable,
Efl.Layout.Calc,
Efl.Layout.Group, Efl.Layout.Signal
Efl.Layout.Calc, Efl.Layout.Group, Efl.Layout.Signal,
Efl.Gfx.Arrangement
{
[[Efl UI image class
@ -44,14 +44,6 @@ class @beta Efl.Ui.Image extends Efl.Ui.Widget implements Efl.Input.Clickable, E
no matter what the scale type is.]]
}
}
@property align {
[[Controls how the internal image is positioned inside an image object.
]]
values {
align_x: double; [[Alignment in the horizontal axis (0 <= align_x <= 1).]]
align_y: double; [[Alignment in the vertical axis (0 <= align_y <= 1).]]
}
}
@property icon {
set {
[[Set the image by icon standards names.
@ -123,6 +115,7 @@ class @beta Efl.Ui.Image extends Efl.Ui.Widget implements Efl.Input.Clickable, E
Efl.Ui.Widget.widget_input_event_handler;
Efl.Access.Component.extents { get; }
Efl.Access.Widget.Action.elm_actions { get; }
Efl.Gfx.Arrangement.content_align { get; set; }
}
events {
drop: string; [[Called when drop from drag and drop happened]] /* FIXME - Belongs to DnD interface */