13 Feb
2017
13 Feb
'17
6:45 p.m.
Author: gadamopoulos
Date: Mon Feb 13 18:45:18 2017
New Revision: 73792
URL: http://svn.reactos.org/svn/reactos?rev=73792&view=rev
Log:
[UXTHEME] -Move the global variables for the scrollbars into the WND_CONTEXT. Hook
ThemeGetScrollInfo to set the correct tracking position as tracking is handled completely
in uxtheme. Fixes scrolling while dragging the scrollbar thumb in the listview control.
Modified:
trunk/reactos/dll/win32/uxtheme/ncscrollbar.c
trunk/reactos/dll/win32/uxtheme/themehooks.c
trunk/reactos/dll/win32/uxtheme/uxthemep.h
Modified: trunk/reactos/dll/win32/uxtheme/ncscrollbar.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/ncscroll…
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/ncscrollbar.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/ncscrollbar.c [iso-8859-1] Mon Feb 13 18:45:18 2017
@@ -13,15 +13,6 @@
#include <assert.h>
-static BOOL SCROLL_trackVertical;
-static enum SCROLL_HITTEST SCROLL_trackHitTest;
-/* Is the moving thumb being displayed? */
-static BOOL SCROLL_MovingThumb = FALSE;
-static HWND SCROLL_TrackingWin = 0;
-static INT SCROLL_TrackingBar = 0;
-static INT SCROLL_TrackingPos = 0;
-static INT SCROLL_TrackingVal = 0;
-
static void ScreenToWindow( HWND hWnd, POINT* pt)
{
RECT rcWnd;
@@ -244,9 +235,9 @@
}
}
-static void SCROLL_DrawMovingThumb( PDRAW_CONTEXT pcontext, SCROLLBARINFO* psbi, BOOL
vertical)
-{
- INT pos = SCROLL_TrackingPos;
+static void SCROLL_DrawMovingThumb(PWND_CONTEXT pwndContext, PDRAW_CONTEXT pcontext,
SCROLLBARINFO* psbi, BOOL vertical)
+{
+ INT pos = pwndContext->SCROLL_TrackingPos;
INT max_size;
if( vertical )
@@ -263,7 +254,7 @@
SCROLL_DrawInterior(pcontext, psbi, pos, vertical, SCROLL_THUMB, 0);
- SCROLL_MovingThumb = !SCROLL_MovingThumb;
+ pwndContext->SCROLL_MovingThumb = !pwndContext->SCROLL_MovingThumb;
}
@@ -274,12 +265,16 @@
SCROLLBARINFO sbi;
BOOL vertical;
enum SCROLL_HITTEST htHot = SCROLL_NOWHERE;
-
- if (SCROLL_TrackingWin)
- return;
+ PWND_CONTEXT pwndContext;
if (((nBar == SB_VERT) && !(pcontext->wi.dwStyle & WS_VSCROLL)) ||
((nBar == SB_HORZ) && !(pcontext->wi.dwStyle & WS_HSCROLL)))
return;
+
+ if (!(pwndContext = ThemeGetWndContext(pcontext->hWnd)))
+ return;
+
+ if (pwndContext->SCROLL_TrackingWin)
+ return;
/* Retrieve scrollbar info */
sbi.cbSize = sizeof(sbi);
@@ -372,7 +367,7 @@
}
static void
-SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt)
+SCROLL_HandleScrollEvent(PWND_CONTEXT pwndContext, HWND hwnd, INT nBar, UINT msg, POINT
pt)
{
/* Previous mouse position for timer events */
static POINT prevPt;
@@ -402,7 +397,7 @@
return;
}
- if ((SCROLL_trackHitTest == SCROLL_NOWHERE) && (msg != WM_LBUTTONDOWN))
+ if ((pwndContext->SCROLL_trackHitTest == SCROLL_NOWHERE) && (msg !=
WM_LBUTTONDOWN))
return;
ThemeInitDrawContext(&context, hwnd, 0);
@@ -417,8 +412,8 @@
{
case WM_LBUTTONDOWN: /* Initialise mouse tracking */
HideCaret(hwnd); /* hide caret while holding down LBUTTON */
- SCROLL_trackVertical = vertical;
- SCROLL_trackHitTest = hittest = SCROLL_HitTest( hwnd, &sbi, vertical, pt,
FALSE );
+ pwndContext->SCROLL_trackVertical = vertical;
+ pwndContext->SCROLL_trackHitTest = hittest = SCROLL_HitTest( hwnd,
&sbi, vertical, pt, FALSE );
lastClickPos = vertical ? (pt.y - sbi.rcScrollBar.top) : (pt.x -
sbi.rcScrollBar.left);
lastMousePos = lastClickPos;
trackThumbPos = sbi.xyThumbTop;
@@ -451,15 +446,15 @@
//TRACE("Event: hwnd=%p bar=%d msg=%s pt=%d,%d hit=%d\n",
// hwnd, nBar, SPY_GetMsgName(msg,hwnd), pt.x, pt.y, hittest );
- switch(SCROLL_trackHitTest)
+ switch(pwndContext->SCROLL_trackHitTest)
{
case SCROLL_NOWHERE: /* No tracking in progress */
break;
case SCROLL_TOP_ARROW:
- if (hittest == SCROLL_trackHitTest)
- {
- SCROLL_DrawArrows( &context, &sbi, vertical, SCROLL_trackHitTest, 0
);
+ if (hittest == pwndContext->SCROLL_trackHitTest)
+ {
+ SCROLL_DrawArrows( &context, &sbi, vertical,
pwndContext->SCROLL_trackHitTest, 0 );
if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER))
{
SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
@@ -478,8 +473,8 @@
break;
case SCROLL_TOP_RECT:
- SCROLL_DrawInterior( &context, &sbi, sbi.xyThumbTop, vertical,
SCROLL_trackHitTest, 0);
- if (hittest == SCROLL_trackHitTest)
+ SCROLL_DrawInterior( &context, &sbi, sbi.xyThumbTop, vertical,
pwndContext->SCROLL_trackHitTest, 0);
+ if (hittest == pwndContext->SCROLL_trackHitTest)
{
if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER))
{
@@ -495,20 +490,20 @@
case SCROLL_THUMB:
if (msg == WM_LBUTTONDOWN)
{
- SCROLL_TrackingWin = hwnd;
- SCROLL_TrackingBar = nBar;
- SCROLL_TrackingPos = trackThumbPos + lastMousePos - lastClickPos;
- SCROLL_TrackingVal = SCROLL_GetThumbVal( &si, &sbi.rcScrollBar,
- vertical, SCROLL_TrackingPos );
- if (!SCROLL_MovingThumb)
- SCROLL_DrawMovingThumb(&context, &sbi, vertical);
+ pwndContext->SCROLL_TrackingWin = hwnd;
+ pwndContext->SCROLL_TrackingBar = nBar;
+ pwndContext->SCROLL_TrackingPos = trackThumbPos + lastMousePos -
lastClickPos;
+ pwndContext->SCROLL_TrackingVal = SCROLL_GetThumbVal( &si,
&sbi.rcScrollBar,
+ vertical,
pwndContext->SCROLL_TrackingPos );
+ if (!pwndContext->SCROLL_MovingThumb)
+ SCROLL_DrawMovingThumb(pwndContext, &context, &sbi, vertical);
}
else if (msg == WM_LBUTTONUP)
{
- if (SCROLL_MovingThumb)
- SCROLL_DrawMovingThumb(&context, &sbi, vertical);
-
- SCROLL_DrawInterior( &context, &sbi, sbi.xyThumbTop, vertical, 0,
SCROLL_trackHitTest );
+ if (pwndContext->SCROLL_MovingThumb)
+ SCROLL_DrawMovingThumb(pwndContext, &context, &sbi, vertical);
+
+ SCROLL_DrawInterior( &context, &sbi, sbi.xyThumbTop, vertical, 0,
pwndContext->SCROLL_trackHitTest );
}
else /* WM_MOUSEMOVE */
{
@@ -521,28 +516,28 @@
pt = SCROLL_ClipPos( &sbi.rcScrollBar, pt );
pos = vertical ? (pt.y - sbi.rcScrollBar.top) : (pt.x -
sbi.rcScrollBar.left);
}
- if ( (pos != lastMousePos) || (!SCROLL_MovingThumb) )
+ if ( (pos != lastMousePos) || (!pwndContext->SCROLL_MovingThumb) )
{
- if (SCROLL_MovingThumb)
- SCROLL_DrawMovingThumb( &context, &sbi, vertical);
+ if (pwndContext->SCROLL_MovingThumb)
+ SCROLL_DrawMovingThumb(pwndContext, &context, &sbi,
vertical);
lastMousePos = pos;
- SCROLL_TrackingPos = trackThumbPos + pos - lastClickPos;
- SCROLL_TrackingVal = SCROLL_GetThumbVal( &si, &sbi.rcScrollBar,
+ pwndContext->SCROLL_TrackingPos = trackThumbPos + pos - lastClickPos;
+ pwndContext->SCROLL_TrackingVal = SCROLL_GetThumbVal( &si,
&sbi.rcScrollBar,
vertical,
- SCROLL_TrackingPos );
+
pwndContext->SCROLL_TrackingPos );
SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
- MAKEWPARAM( SB_THUMBTRACK, SCROLL_TrackingVal),
+ MAKEWPARAM( SB_THUMBTRACK,
pwndContext->SCROLL_TrackingVal),
(LPARAM)hwndCtl );
- if (!SCROLL_MovingThumb)
- SCROLL_DrawMovingThumb( &context, &sbi, vertical);
+ if (!pwndContext->SCROLL_MovingThumb)
+ SCROLL_DrawMovingThumb(pwndContext, &context, &sbi,
vertical);
}
}
break;
case SCROLL_BOTTOM_RECT:
- if (hittest == SCROLL_trackHitTest)
- {
- SCROLL_DrawInterior( &context, &sbi, sbi.xyThumbTop, vertical,
SCROLL_trackHitTest, 0 );
+ if (hittest == pwndContext->SCROLL_trackHitTest)
+ {
+ SCROLL_DrawInterior( &context, &sbi, sbi.xyThumbTop, vertical,
pwndContext->SCROLL_trackHitTest, 0 );
if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER))
{
SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
@@ -559,9 +554,9 @@
break;
case SCROLL_BOTTOM_ARROW:
- if (hittest == SCROLL_trackHitTest)
- {
- SCROLL_DrawArrows( &context, &sbi, vertical, SCROLL_trackHitTest, 0
);
+ if (hittest == pwndContext->SCROLL_trackHitTest)
+ {
+ SCROLL_DrawArrows( &context, &sbi, vertical,
pwndContext->SCROLL_trackHitTest, 0 );
if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER))
{
SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
@@ -593,8 +588,8 @@
if (msg == WM_LBUTTONUP)
{
- hittest = SCROLL_trackHitTest;
- SCROLL_trackHitTest = SCROLL_NOWHERE; /* Terminate tracking */
+ hittest = pwndContext->SCROLL_trackHitTest;
+ pwndContext->SCROLL_trackHitTest = SCROLL_NOWHERE; /* Terminate tracking */
if (hittest == SCROLL_THUMB)
{
@@ -608,7 +603,7 @@
SB_ENDSCROLL, (LPARAM)hwndCtl );
/* Terminate tracking */
- SCROLL_TrackingWin = 0;
+ pwndContext->SCROLL_TrackingWin = 0;
}
ThemeCleanupDrawContext(&context);
@@ -618,10 +613,13 @@
SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt )
{
MSG msg;
+ PWND_CONTEXT pwndContext = ThemeGetWndContext(hwnd);
+ if(!pwndContext)
+ return;
ScreenToWindow(hwnd, &pt);
- SCROLL_HandleScrollEvent( hwnd, scrollbar, WM_LBUTTONDOWN, pt );
+ SCROLL_HandleScrollEvent(pwndContext, hwnd, scrollbar, WM_LBUTTONDOWN, pt );
do
{
@@ -635,7 +633,7 @@
pt.y = GET_Y_LPARAM(msg.lParam);
ClientToScreen(hwnd, &pt);
ScreenToWindow(hwnd, &pt);
- SCROLL_HandleScrollEvent( hwnd, scrollbar, msg.message, pt );
+ SCROLL_HandleScrollEvent(pwndContext, hwnd, scrollbar, msg.message, pt );
}
else
{
Modified: trunk/reactos/dll/win32/uxtheme/themehooks.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/themehoo…
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] Mon Feb 13 18:45:18 2017
@@ -267,6 +267,44 @@
}
return user32ApiHook.SetWindowRgn(hWnd, hRgn, bRedraw);
+}
+
+BOOL ThemeGetScrollInfo(HWND hwnd, int fnBar, LPSCROLLINFO lpsi)
+{
+ PWND_CONTEXT pwndContext;
+ DWORD style;
+ BOOL ret;
+
+ /* Avoid creating a window context if it is not needed */
+ if(!IsAppThemed())
+ goto dodefault;
+
+ style = GetWindowLongW(hwnd, GWL_STYLE);
+ if((style & (WS_HSCROLL|WS_VSCROLL))==0)
+ goto dodefault;
+
+ pwndContext = ThemeGetWndContext(hwnd);
+ if (pwndContext == NULL)
+ goto dodefault;
+
+ /*
+ * Uxtheme needs to handle the tracking of the scrollbar itself
+ * This means than if an application needs to get the track position
+ * with GetScrollInfo, it will get wrong data. So uxtheme needs to
+ * hook it and set the correct tracking position itself
+ */
+ ret = user32ApiHook.GetScrollInfo(hwnd, fnBar, lpsi);
+ if ( lpsi &&
+ (lpsi->fMask & SIF_TRACKPOS) &&
+ pwndContext->SCROLL_TrackingWin == hwnd &&
+ pwndContext->SCROLL_TrackingBar == fnBar)
+ {
+ lpsi->nTrackPos = pwndContext->SCROLL_TrackingVal;
+ }
+ return ret;
+
+dodefault:
+ return user32ApiHook.GetScrollInfo(hwnd, fnBar, lpsi);
}
/**********************************************************************
@@ -303,6 +341,7 @@
puah->DlgProcArray.Size = UAHOWP_MAX_SIZE;
puah->SetWindowRgn = ThemeSetWindowRgn;
+ puah->GetScrollInfo = (FARPROC)ThemeGetScrollInfo;
UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_NCPAINT);
UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_NCACTIVATE);
Modified: trunk/reactos/dll/win32/uxtheme/uxthemep.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxthemep…
==============================================================================
--- trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] Mon Feb 13 18:45:18 2017
@@ -118,6 +118,16 @@
LPCWSTR UXINI_GetNextValue(PUXINI_FILE uf, DWORD *dwNameLen, LPCWSTR *lpValue, DWORD
*dwValueLen);
BOOL UXINI_FindValue(PUXINI_FILE uf, LPCWSTR lpName, LPCWSTR *lpValue, DWORD
*dwValueLen);
+ /* Scroll-bar hit testing */
+enum SCROLL_HITTEST
+{
+ SCROLL_NOWHERE, /* Outside the scroll bar */
+ SCROLL_TOP_ARROW, /* Top or left arrow */
+ SCROLL_TOP_RECT, /* Rectangle between the top arrow and the thumb */
+ SCROLL_THUMB, /* Thumb rectangle */
+ SCROLL_BOTTOM_RECT, /* Rectangle between the thumb and the bottom arrow */
+ SCROLL_BOTTOM_ARROW /* Bottom or right arrow */
+};
/* The window context stores data for the window needed through the life of the window
*/
typedef struct _WND_CONTEXT
@@ -127,6 +137,14 @@
BOOL HasThemeRgn;
BOOL UpdatingRgn;
BOOL DirtyThemeRegion;
+
+ BOOL SCROLL_trackVertical;
+ enum SCROLL_HITTEST SCROLL_trackHitTest;
+ BOOL SCROLL_MovingThumb; /* Is the moving thumb being displayed? */
+ HWND SCROLL_TrackingWin;
+ INT SCROLL_TrackingBar;
+ INT SCROLL_TrackingPos;
+ INT SCROLL_TrackingVal;
} WND_CONTEXT, *PWND_CONTEXT;
/* The draw context stores data that are needed by the drawing operations in the non
client area of the window */
@@ -168,17 +186,6 @@
BUTTON_INACTIVE
} THEME_BUTTON_STATES;
- /* Scroll-bar hit testing */
-enum SCROLL_HITTEST
-{
- SCROLL_NOWHERE, /* Outside the scroll bar */
- SCROLL_TOP_ARROW, /* Top or left arrow */
- SCROLL_TOP_RECT, /* Rectangle between the top arrow and the thumb */
- SCROLL_THUMB, /* Thumb rectangle */
- SCROLL_BOTTOM_RECT, /* Rectangle between the thumb and the bottom arrow */
- SCROLL_BOTTOM_ARROW /* Bottom or right arrow */
-};
-
#define HT_ISBUTTON(ht) ((ht) == HTMINBUTTON || (ht) == HTMAXBUTTON || (ht) == HTCLOSE ||
(ht) == HTHELP)
#define HASSIZEGRIP(Style, ExStyle, ParentStyle, WindowRect, ParentClientRect) \