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

Merge branch 'master' into devs/hermet/lottie

This commit is contained in:
Hermet Park 2019-09-04 20:03:42 +09:00
parent fd869bb04b c5b88ca745
commit 27cc89c24d
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lib/ector/software/ector_software_rasterizer.c
View File

@ -284,6 +284,7 @@ _blend_gradient(int count, const SW_FT_Span *spans, void *user_data)
while (length) while (length)
{ {
l = MIN(length, BLEND_GRADIENT_BUFFER_SIZE); 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); fetchfunc(buffer, sd, spans->y, spans->x, l);
comp_func(target, buffer, l, sd->mul_col, spans->coverage); comp_func(target, buffer, l, sd->mul_col, spans->coverage);
target += l; target += l;
@ -316,13 +317,14 @@ _blend_gradient_alpha(int count, const SW_FT_Span *spans, void *user_data)
while (count--) 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); uint32_t *mtarget = mbuffer + ((mask->generic->w * spans->y) + spans->x);
int length = spans->len; int length = spans->len;
while (length) while (length)
{ {
int l = MIN(length, BLEND_GRADIENT_BUFFER_SIZE); 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); fetchfunc(gbuffer, sd, spans->y, spans->x, l);
uint32_t *temp = gbuffer; uint32_t *temp = gbuffer;
@ -364,13 +366,14 @@ _blend_gradient_alpha_inv(int count, const SW_FT_Span *spans, void *user_data)
while (count--) 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); uint32_t *mtarget = mbuffer + ((mask->generic->w * spans->y) + spans->x);
int length = spans->len; int length = spans->len;
while (length) while (length)
{ {
int l = MIN(length, BLEND_GRADIENT_BUFFER_SIZE); 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); fetchfunc(gbuffer, sd, spans->y, spans->x, l);
uint32_t *temp = gbuffer; uint32_t *temp = gbuffer;

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

@ -245,7 +245,7 @@ _efl_ui_timepicker_time_get(const Eo *obj EINA_UNUSED, Efl_Ui_Timepicker_Data *p
} }
EOLIAN static void 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; 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 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; return pd->is_24hour;
} }

2
src/lib/elementary/efl_ui_timepicker.eo
View File

@ -23,7 +23,7 @@ class @beta Efl.Ui.Timepicker extends Efl.Ui.Layout_Base
min: int; [[The minute value from 0 to 59.]] 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.]] [[Control if the Timepicker displays 24 hour time or 12 hour time including AM/PM button.]]
set { set {
} }