Fix elm_scroller_page_show bug. It have to save the wanted values to show the wanted...

Conflicts:
	ChangeLog
	NEWS

Change-Id: If54d546cddff659a1ab0a66f809d51a5f05646e7

diff --git a/ChangeLog b/ChangeLog
index 34fea79..2d727ac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1026,3 +1026,63 @@
 2013-05-27 Seunggyun Kim
         * Add elm_config_glayer_long_tap_start_timeout_set/get,
         elm_config_glayer_double_tap_timeout_set/get
+
+2013-05-30  ChunEon Park
+
+        * Fix the mapbuf to be enabled before it's content is entirely rendered
+        once.
+
+2013-06-05  Ryuan Choi (ryuan)
+
+        * Fix elm_colorselector does not update color bar when picker changed color.
+
+2013-06-05  ChunEon Park (Hermet)
+
+        * Fix navifame to recover the focus for the prev page when top item is deleted.
+
+2013-06-06  Ryuan Choi (ryuan)
+
+        * Up/down step of hour decimal of elm_clock is changed to 12 not to touch hour unit at editing mode.
+
+2013-06-07  Thiep Ha
+
+        * Add magnifier to entry.
+
+2013-06-10  ChunEon Park (Hermet)
+
+        * Remove the keyboard area in the conformant if the keyboard state is off.
+
+2013-06-10  Daniel Juyung Seo (SeoZ)
+
+        * Add "focused" and "unfocused" smart callback for panel, video, web,
+        web2, genlist, hover, index, list, map, photocam, progressbar, radio,
+        scroller, slider, slideshow, spinner, toolbar, win, calendar, check,
+        clock, colorselector, datetime, diskselector, flipselector, gengrid,
+        ctxpopup, fileselector_button, naviframe, player, popup, bubble, button.
+
+2013-06-05  Ryuan Choi (ryuan)
+
+        * Fix colorselector send "changed" signal twice when pressed color bar.
+
+2013-06-11  ChunEon Park (Hermet)
+
+        * Keep the smart members of the naviframe views whenever resize object is changed.
+                 This prevents the dangling view objects of the naviframe and keep the layer
+                 consistency.
+
+2013-06-13  Ryuan Choi (ryuan)
+
+        * Replace uri to url from elm_web_uri_get, elm_web_uri_set and "uri,changed" signal.
+        Previous APIs and signal are deprecated.
+
+2013-06-16  ChunEon Park (Hermet)
+
+        * Naviframe: Dont' be popped if the event is freezed and popping is going on.
+
+2013-06-18  Jaehwan Kim
+
+        * In case of scroll in scroll, the child scroller have to bounce if parents don't have a bounce.
+
+2013-06-19  Jaehwan Kim
+
+        * Fix elm_scroller_page_show bug. It have to save the wanted values to show the wanted page.

diff --git a/NEWS b/NEWS
index f5b3179..092b4e7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -102,6 +102,38 @@ Fixes :
    * Fix small memory leak in elm_map error path
    * Focus highlight should not be shown on (0, 0).
    * Fix the elm_shutdown bug in _elm_shutdown_config.
+   * Fix box layout bug when items with max size force sizes below minimum.
+   * Fix ctxpopup geometry when parent is an elm_win.
+   * Quit the scroll animator if the scroller don't have a bounce and reach a edge.
+   * Fix the scroller show by a page if the page size is set and the region_bring_in or region_show is called.
+   * Fix elc_player crash issue.
+   * Fix the region_show/region_bring_in don't have a limit at a paging movement.
+   * Fix the calculation double type number.
+   * Fix the policy is not changed when the theme is changed.
+   * When entry is disabled, scrolling is also disabled.
+   * Make access object unfocusable when Aaccessibility is disabled.
+   * Fix the scrolled entry in scroller is located wrong position when the cursor is changed.
+   * Fix null pointer access on naviframe item deletion.
+   * Fix the toolbar item clipped problem on reordering items.
+   * Fix elm_object_cursor_theme_search_enabled_set to do as it's name described.
+   * Elm_entry_filter_accept_set function now can recognize tags.
+   * Don't be dead even if a ctxpopup item callback is null.
+   * Fix gengrid does not work under the accessibility.
+   * Fix do not append NULL to genlist focus list.
+   * Fix elm_clock_first_interval_set writes wrong value.
+   * Fix remained ecore timer issue when gesture layer was deleted.
+   * Fix ctxpopup can't be called again in the mobile mode entry.
+   * Fix colorselector color change but when palette item is selected.
+   * Fix elm_colorselector does not emit "changed" when clicked color palatte.
+   * Fix elm_mapbuf to be enabled before it's content is entirely rendered once.     this will reduce the cases that content is not updated in the screen.
+   * Fix elm_colorselector does not update color bar when picker changed color.
+   * Fix navifame to recover the focus for the prev page when top item is deleted.
+   * Up/down step of hour decimal of elm_clock is changed to 12 not to touch hour unit at editing mode.
+   * Remove the keyboard area in the conformant if the keyboard state is off.
+   * Fix colorselector send "changed" signal twice when pressed color bar.
+   * Keep the smart members of the naviframe views whenever resize object is changed. This prevents the dangling view objects of the naviframe and keep the layer consistency.
+   * In case of scroll in scroll, the child scroller have to bounce if parents don't have a bounce.
+   * Fix elm_scroller_page_show bug. It have to save the wanted values to show the wanted page.
 
 Removals:
 

diff --git a/src/lib/elm_interface_scrollable.c b/src/lib/elm_interface_scrollable.c
index e931fc3..ed6eb32 100644 (file)
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -4026,6 +4026,12 @@ _elm_scroll_page_show(Evas_Object *obj,
    _elm_scroll_content_viewport_size_get(sid->obj, &w, &h);
    if (pagenumber_h >= 0) x = sid->pagesize_h * pagenumber_h;
    if (pagenumber_v >= 0) y = sid->pagesize_v * pagenumber_v;
+
+   sid->wx = x;
+   sid->wy = y;
+   sid->ww = w;
+   sid->wh = h;
+
    if (_elm_scroll_content_region_show_internal(obj, &x, &y, w, h))
      _elm_scroll_content_pos_set(obj, x, y, EINA_TRUE);
 }