forked from enlightenment/efl
Rename orientation -> image_orientation.
Summary: Efl.Gfx.Image_Orientable and Efl.Ui.Layout_Orientable have same property name. So when class extends both interfaces, it makes conflict. Relates to T7924 Reviewers: woohyun, segfaultxavi Reviewed By: segfaultxavi Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D9299
This commit is contained in:
parent
e24d6aee69
commit
7d33cf977f
|
@ -28,9 +28,9 @@ enum Efl.Gfx.Image_Orientation
|
||||||
interface Efl.Gfx.Image_Orientable
|
interface Efl.Gfx.Image_Orientable
|
||||||
{
|
{
|
||||||
[[Interface for objects which can be oriented.]]
|
[[Interface for objects which can be oriented.]]
|
||||||
c_prefix: efl_gfx_image;
|
c_prefix: efl_gfx;
|
||||||
methods {
|
methods {
|
||||||
@property orientation {
|
@property image_orientation {
|
||||||
[[Control the orientation (rotation and flipping) of a visual object.
|
[[Control the orientation (rotation and flipping) of a visual object.
|
||||||
|
|
||||||
This can be used to set the rotation on an image or a window, for
|
This can be used to set the rotation on an image or a window, for
|
||||||
|
|
|
@ -1362,7 +1362,7 @@ _efl_ui_image_efl_gfx_image_load_controller_load_size_get(const Eo *obj EINA_UNU
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_efl_ui_image_efl_gfx_image_orientable_orientation_set(Eo *obj, Efl_Ui_Image_Data *sd, Efl_Gfx_Image_Orientation orient)
|
_efl_ui_image_efl_gfx_image_orientable_image_orientation_set(Eo *obj, Efl_Ui_Image_Data *sd, Efl_Gfx_Image_Orientation orient)
|
||||||
{
|
{
|
||||||
if (sd->edje) return;
|
if (sd->edje) return;
|
||||||
if (sd->orient == orient) return;
|
if (sd->orient == orient) return;
|
||||||
|
@ -1372,7 +1372,7 @@ _efl_ui_image_efl_gfx_image_orientable_orientation_set(Eo *obj, Efl_Ui_Image_Dat
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Efl_Gfx_Image_Orientation
|
EOLIAN static Efl_Gfx_Image_Orientation
|
||||||
_efl_ui_image_efl_gfx_image_orientable_orientation_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
|
_efl_ui_image_efl_gfx_image_orientable_image_orientation_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
|
||||||
{
|
{
|
||||||
return sd->orient;
|
return sd->orient;
|
||||||
}
|
}
|
||||||
|
|
|
@ -100,7 +100,7 @@ class @beta Efl.Ui.Image extends Efl.Ui.Widget implements Efl.Ui.Clickable, Efl.
|
||||||
Efl.Gfx.Image_Load_Controller.load_size { get; set; }
|
Efl.Gfx.Image_Load_Controller.load_size { get; set; }
|
||||||
Efl.Gfx.Image.smooth_scale { get; set; }
|
Efl.Gfx.Image.smooth_scale { get; set; }
|
||||||
Efl.Gfx.Image.scale_type { get; set; }
|
Efl.Gfx.Image.scale_type { get; set; }
|
||||||
Efl.Gfx.Image_Orientable.orientation { get; set; }
|
Efl.Gfx.Image_Orientable.image_orientation { get; set; }
|
||||||
Efl.Player.playable { get; }
|
Efl.Player.playable { get; }
|
||||||
Efl.Player.play { get; set; }
|
Efl.Player.play { get; set; }
|
||||||
Efl.Layout.Signal.signal_emit;
|
Efl.Layout.Signal.signal_emit;
|
||||||
|
|
|
@ -1331,7 +1331,7 @@ _orient_apply(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd)
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_efl_ui_image_zoomable_efl_gfx_image_orientable_orientation_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd,
|
_efl_ui_image_zoomable_efl_gfx_image_orientable_image_orientation_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd,
|
||||||
Efl_Gfx_Image_Orientation orient)
|
Efl_Gfx_Image_Orientation orient)
|
||||||
{
|
{
|
||||||
if (sd->orient == orient) return;
|
if (sd->orient == orient) return;
|
||||||
|
@ -1341,7 +1341,7 @@ _efl_ui_image_zoomable_efl_gfx_image_orientable_orientation_set(Eo *obj, Efl_Ui_
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Efl_Gfx_Image_Orientation
|
EOLIAN static Efl_Gfx_Image_Orientation
|
||||||
_efl_ui_image_zoomable_efl_gfx_image_orientable_orientation_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd)
|
_efl_ui_image_zoomable_efl_gfx_image_orientable_image_orientation_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd)
|
||||||
{
|
{
|
||||||
return sd->orient;
|
return sd->orient;
|
||||||
}
|
}
|
||||||
|
|
|
@ -65,7 +65,7 @@ class @beta Efl.Ui.Image_Zoomable extends Efl.Ui.Image implements Efl.Ui.Zoom,
|
||||||
Efl.Access.Widget.Action.elm_actions { get; }
|
Efl.Access.Widget.Action.elm_actions { get; }
|
||||||
Efl.File.load;
|
Efl.File.load;
|
||||||
Efl.File.file { get; set; }
|
Efl.File.file { get; set; }
|
||||||
Efl.Gfx.Image_Orientable.orientation { get; set; }
|
Efl.Gfx.Image_Orientable.image_orientation { get; set; }
|
||||||
Efl.Layout.Group.group_size_min { get; }
|
Efl.Layout.Group.group_size_min { get; }
|
||||||
Efl.Layout.Group.group_size_max { get; }
|
Efl.Layout.Group.group_size_max { get; }
|
||||||
Efl.Layout.Signal.signal_callback_add;
|
Efl.Layout.Signal.signal_callback_add;
|
||||||
|
|
|
@ -11,7 +11,7 @@ abstract @beta Efl.Canvas.Image_Internal extends Efl.Canvas.Object implements Ef
|
||||||
Efl.Object.finalize;
|
Efl.Object.finalize;
|
||||||
Efl.Object.debug_name_override;
|
Efl.Object.debug_name_override;
|
||||||
Efl.File_Save.save;
|
Efl.File_Save.save;
|
||||||
Efl.Gfx.Image_Orientable.orientation { get; set; }
|
Efl.Gfx.Image_Orientable.image_orientation { get; set; }
|
||||||
Efl.Gfx.Image.smooth_scale { get; set; }
|
Efl.Gfx.Image.smooth_scale { get; set; }
|
||||||
Efl.Gfx.Image.ratio { get; }
|
Efl.Gfx.Image.ratio { get; }
|
||||||
Efl.Gfx.Image.border { get; set; }
|
Efl.Gfx.Image.border { get; set; }
|
||||||
|
|
|
@ -412,7 +412,7 @@ _evas_image_orientation_set(Eo *eo_obj, Evas_Image_Data *o, Evas_Image_Orient or
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_efl_canvas_image_internal_efl_gfx_image_orientable_orientation_set(Eo *obj, Evas_Image_Data *o, Efl_Gfx_Image_Orientation efl_orient)
|
_efl_canvas_image_internal_efl_gfx_image_orientable_image_orientation_set(Eo *obj, Evas_Image_Data *o, Efl_Gfx_Image_Orientation efl_orient)
|
||||||
{
|
{
|
||||||
// This array takes an Efl_Gfx_Image_Orientation and turns it into an Elm_Image_Orient
|
// This array takes an Efl_Gfx_Image_Orientation and turns it into an Elm_Image_Orient
|
||||||
static const Evas_Image_Orient evas_orient[16] = {
|
static const Evas_Image_Orient evas_orient[16] = {
|
||||||
|
@ -440,7 +440,7 @@ _efl_canvas_image_internal_efl_gfx_image_orientable_orientation_set(Eo *obj, Eva
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Efl_Gfx_Image_Orientation
|
EOLIAN static Efl_Gfx_Image_Orientation
|
||||||
_efl_canvas_image_internal_efl_gfx_image_orientable_orientation_get(const Eo *obj EINA_UNUSED, Evas_Image_Data *o)
|
_efl_canvas_image_internal_efl_gfx_image_orientable_image_orientation_get(const Eo *obj EINA_UNUSED, Evas_Image_Data *o)
|
||||||
{
|
{
|
||||||
return o->orient_value;
|
return o->orient_value;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue