On Mon, 25 Nov 2013 12:28:11 +0000 Tom Hacohen <[email protected]> said:
> You deleted code and added a few printfs, I don't think that's what you > meant to do. ;) printfs snuck in - i forgot i had them. i did fix the bug. i did intend everything other than the printfs. :) > On 25/11/13 12:22, Carsten Haitzler wrote: > > raster pushed a commit to branch master. > > > > http://git.enlightenment.org/core/elementary.git/commit/?id=d9ffa84adf34438647f4921e25755c595ba33a1c > > > > commit d9ffa84adf34438647f4921e25755c595ba33a1c > > Author: Carsten Haitzler (Rasterman) <[email protected]> > > Date: Mon Nov 25 21:22:11 2013 +0900 > > > > elm - scroller - fix missing large set of signal callbacks on scrollbar > > > > this fixes T138 and a bunch of other missing callback signals > > --- > > src/lib/elm_interface_scrollable.c | 20 ++++++-------------- > > 1 file changed, 6 insertions(+), 14 deletions(-) > > > > diff --git a/src/lib/elm_interface_scrollable.c > > b/src/lib/elm_interface_scrollable.c index f94f8f8..615c0a9 100644 > > --- a/src/lib/elm_interface_scrollable.c > > +++ b/src/lib/elm_interface_scrollable.c > > @@ -932,7 +932,7 @@ static void > > _elm_scroll_scroll_bar_read_and_update( > > Elm_Scrollable_Smart_Interface_Data *sid) > > { > > - Evas_Coord x, y, mx = 0, my = 0, px = 0, py = 0, minx = 0, miny = 0; > > + Evas_Coord x, y, mx = 0, my = 0, minx = 0, miny = 0; > > double vx, vy; > > > > if (!sid->edje_obj || !sid->pan_obj) return; > > @@ -949,19 +949,7 @@ _elm_scroll_scroll_bar_read_and_update( > > eo_do(sid->pan_obj, elm_obj_pan_pos_min_get(&minx, &miny)); > > x = _round(vx * (double)mx + minx, 1); > > y = _round(vy * (double)my + miny, 1); > > - eo_do(sid->pan_obj, elm_obj_pan_pos_get(&px, &py)); > > - > > - if (!sid->freeze && _paging_is_enabled(sid)) > > - { > > - x = _elm_scroll_page_x_get(sid, x - px, EINA_FALSE); > > - y = _elm_scroll_page_y_get(sid, y - py, EINA_FALSE); > > - } > > - > > - eo_do(sid->pan_obj, elm_obj_pan_pos_set(x, y)); > > - if ((px != x) || (py != y)) > > - { > > - edje_object_signal_emit(sid->edje_obj, "elm,action,scroll", "elm"); > > - } > > + eo_do(sid->obj, elm_scrollable_interface_content_pos_set(x, y, > > EINA_TRUE)); } > > > > static void > > @@ -1536,6 +1524,8 @@ _elm_scroll_content_pos_set(Eo *obj, void *_pd, > > va_list *list) > > > > Elm_Scrollable_Smart_Interface_Data *sid = _pd; > > > > + printf("pos set...\n"); > > + > > if (!sid->edje_obj || !sid->pan_obj) return; > > > > // FIXME: allow for bounce outside of range > > @@ -1606,6 +1596,8 @@ _elm_scroll_content_pos_set(Eo *obj, void *_pd, > > va_list *list) (sid->edje_obj, "elm.dragable.vbar", 0.0, vy); > > edje_object_part_drag_value_set > > (sid->edje_obj, "elm.dragable.hbar", vx, 0.0); > > + > > + printf("pos set %i/%i[%i] %i/%i[%i]\n", x, mx + minx, minx, y, my + > > miny, miny); > > > > if (!sid->down.bounce_x_animator) > > { > > > > > ------------------------------------------------------------------------------ > Shape the Mobile Experience: Free Subscription > Software experts and developers: Be at the forefront of tech innovation. > Intel(R) Software Adrenaline delivers strategic insight and game-changing > conversations that shape the rapidly evolving mobile landscape. Sign up now. > http://pubads.g.doubleclick.net/gampad/clk?id=63431311&iu=/4140/ostg.clktrk > _______________________________________________ > enlightenment-devel mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > -- ------------- Codito, ergo sum - "I code, therefore I am" -------------- The Rasterman (Carsten Haitzler) [email protected] ------------------------------------------------------------------------------ Shape the Mobile Experience: Free Subscription Software experts and developers: Be at the forefront of tech innovation. Intel(R) Software Adrenaline delivers strategic insight and game-changing conversations that shape the rapidly evolving mobile landscape. Sign up now. http://pubads.g.doubleclick.net/gampad/clk?id=63431311&iu=/4140/ostg.clktrk _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
