Author: akhaldi Date: Tue May 3 22:31:13 2016 New Revision: 71257
URL: http://svn.reactos.org/svn/reactos?rev=71257&view=rev Log: [0.4.1] Merge the scroll bar glitch fix by Herschel Ralston in r71231. CORE-3923 CORE-11155
Modified: branches/ros-branch-0_4_1/ (props changed) branches/ros-branch-0_4_1/reactos/ (props changed) branches/ros-branch-0_4_1/reactos/win32ss/user/user32/controls/scrollbar.c
Propchange: branches/ros-branch-0_4_1/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 3 22:31:13 2016 @@ -1 +1 @@ -/trunk:71217,71252,71255 +/trunk:71217,71231,71252,71255
Propchange: branches/ros-branch-0_4_1/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 3 22:31:13 2016 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:71217,71232,71252 +/trunk/reactos:71217,71231-71232,71252
Modified: branches/ros-branch-0_4_1/reactos/win32ss/user/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/reactos/win32ss... ============================================================================== --- branches/ros-branch-0_4_1/reactos/win32ss/user/user32/controls/scrollbar.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_1/reactos/win32ss/user/user32/controls/scrollbar.c [iso-8859-1] Tue May 3 22:31:13 2016 @@ -855,6 +855,7 @@ NewInfo.rgstate[ScrollTrackHitTest] = ScrollBarInfo.rgstate[ScrollTrackHitTest]; NtUserSetScrollBarInfo(Wnd, IntScrollGetObjectId(SBType), &NewInfo);
+ IntDrawScrollInterior(Wnd,Dc,SBType,Vertical,&ScrollBarInfo); IntDrawScrollArrows(Dc, &ScrollBarInfo, Vertical);
break;