forked from enlightenment/efl
Merge branch 'master' into devs/hermet/lottie
This commit is contained in:
commit
27cc89c24d
|
@ -284,6 +284,7 @@ _blend_gradient(int count, const SW_FT_Span *spans, void *user_data)
|
|||
while (length)
|
||||
{
|
||||
l = MIN(length, BLEND_GRADIENT_BUFFER_SIZE);
|
||||
//FIXME: span->x must have adding an offset as much as subtracted length...
|
||||
fetchfunc(buffer, sd, spans->y, spans->x, l);
|
||||
comp_func(target, buffer, l, sd->mul_col, spans->coverage);
|
||||
target += l;
|
||||
|
@ -316,13 +317,14 @@ _blend_gradient_alpha(int count, const SW_FT_Span *spans, void *user_data)
|
|||
|
||||
while (count--)
|
||||
{
|
||||
uint32_t *target = buffer + ((sd->raster_buffer->generic->w * spans->y) + spans->x);
|
||||
uint32_t *target = buffer + ((pix_stride * spans->y) + spans->x);
|
||||
uint32_t *mtarget = mbuffer + ((mask->generic->w * spans->y) + spans->x);
|
||||
int length = spans->len;
|
||||
|
||||
while (length)
|
||||
{
|
||||
int l = MIN(length, BLEND_GRADIENT_BUFFER_SIZE);
|
||||
//FIXME: span->x must have adding an offset as much as subtracted length...
|
||||
fetchfunc(gbuffer, sd, spans->y, spans->x, l);
|
||||
uint32_t *temp = gbuffer;
|
||||
|
||||
|
@ -364,13 +366,14 @@ _blend_gradient_alpha_inv(int count, const SW_FT_Span *spans, void *user_data)
|
|||
|
||||
while (count--)
|
||||
{
|
||||
uint32_t *target = buffer + ((sd->raster_buffer->generic->w * spans->y) + spans->x);
|
||||
uint32_t *target = buffer + ((pix_stride * spans->y) + spans->x);
|
||||
uint32_t *mtarget = mbuffer + ((mask->generic->w * spans->y) + spans->x);
|
||||
int length = spans->len;
|
||||
|
||||
while (length)
|
||||
{
|
||||
int l = MIN(length, BLEND_GRADIENT_BUFFER_SIZE);
|
||||
//FIXME: span->x must have adding an offset as much as subtracted length...
|
||||
fetchfunc(gbuffer, sd, spans->y, spans->x, l);
|
||||
uint32_t *temp = gbuffer;
|
||||
|
||||
|
|
|
@ -245,7 +245,7 @@ _efl_ui_timepicker_time_get(const Eo *obj EINA_UNUSED, Efl_Ui_Timepicker_Data *p
|
|||
}
|
||||
|
||||
EOLIAN static void
|
||||
_efl_ui_timepicker_ampm_set(Eo *obj, Efl_Ui_Timepicker_Data *pd, Eina_Bool is_24hour)
|
||||
_efl_ui_timepicker_is_24hour_set(Eo *obj, Efl_Ui_Timepicker_Data *pd, Eina_Bool is_24hour)
|
||||
{
|
||||
if (pd->is_24hour == is_24hour) return;
|
||||
|
||||
|
@ -258,7 +258,7 @@ _efl_ui_timepicker_ampm_set(Eo *obj, Efl_Ui_Timepicker_Data *pd, Eina_Bool is_24
|
|||
}
|
||||
|
||||
EOLIAN static Eina_Bool
|
||||
_efl_ui_timepicker_ampm_get(const Eo *obj EINA_UNUSED, Efl_Ui_Timepicker_Data *pd)
|
||||
_efl_ui_timepicker_is_24hour_get(const Eo *obj EINA_UNUSED, Efl_Ui_Timepicker_Data *pd)
|
||||
{
|
||||
return pd->is_24hour;
|
||||
}
|
||||
|
|
|
@ -23,7 +23,7 @@ class @beta Efl.Ui.Timepicker extends Efl.Ui.Layout_Base
|
|||
min: int; [[The minute value from 0 to 59.]]
|
||||
}
|
||||
}
|
||||
@property ampm {
|
||||
@property is_24hour {
|
||||
[[Control if the Timepicker displays 24 hour time or 12 hour time including AM/PM button.]]
|
||||
set {
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue