Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 06:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed some scrolling issues

Browse source 
svn path=/trunk/; revision=16407
This commit is contained in:
Thomas Bluemel 2005-07-04 11:52:16 +00:00
parent 48e0fe423b
commit 0140b609d9
1 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

35
reactos/lib/aclui/checklist.c
View file

@ -310,17 +310,16 @@ PtToCheckItemBox(IN PCHECKLISTWND infoPtr,
if (DirectlyInCheckBox != NULL) if (DirectlyInCheckBox != NULL)
{ {
INT y = ppt->y % infoPtr->ItemHeight; INT y = ppt->y % infoPtr->ItemHeight;
INT cxBox = infoPtr->ItemHeight - (2 * CI_TEXT_MARGIN_HEIGHT);
if ((y >= CI_TEXT_MARGIN_HEIGHT && if ((y >= CI_TEXT_MARGIN_HEIGHT &&
y < infoPtr->ItemHeight - CI_TEXT_MARGIN_HEIGHT) && y < infoPtr->ItemHeight - CI_TEXT_MARGIN_HEIGHT) &&
(((ppt->x >= (infoPtr->CheckBoxLeft[CLB_ALLOW] - (infoPtr->ItemHeight / 2))) && (((ppt->x >= (infoPtr->CheckBoxLeft[CLB_ALLOW] - (cxBox / 2))) &&
(ppt->x < (infoPtr->CheckBoxLeft[CLB_ALLOW] - (infoPtr->ItemHeight / 2) + (ppt->x < (infoPtr->CheckBoxLeft[CLB_ALLOW] - (cxBox / 2) + cxBox)))
infoPtr->ItemHeight - (2 * CI_TEXT_MARGIN_HEIGHT))))
|| ||
((ppt->x >= (infoPtr->CheckBoxLeft[CLB_DENY] - (infoPtr->ItemHeight / 2))) && ((ppt->x >= (infoPtr->CheckBoxLeft[CLB_DENY] - (cxBox / 2))) &&
(ppt->x < (infoPtr->CheckBoxLeft[CLB_DENY] - (infoPtr->ItemHeight / 2) + (ppt->x < (infoPtr->CheckBoxLeft[CLB_DENY] - (cxBox / 2) + cxBox)))))
infoPtr->ItemHeight - (2 * CI_TEXT_MARGIN_HEIGHT))))))
{ {
*DirectlyInCheckBox = TRUE; *DirectlyInCheckBox = TRUE;
} }
@ -446,6 +445,7 @@ UpdateControl(IN PCHECKLISTWND infoPtr,
RECT rcClient; RECT rcClient;
SCROLLINFO ScrollInfo; SCROLLINFO ScrollInfo;
LONG Style; LONG Style;
INT VisibleItems;
GetClientRect(infoPtr->hSelf, GetClientRect(infoPtr->hSelf,
&rcClient); &rcClient);
@ -457,6 +457,18 @@ UpdateControl(IN PCHECKLISTWND infoPtr,
ScrollInfo.nPage = ((rcClient.bottom - rcClient.top) + infoPtr->ItemHeight - 1) / infoPtr->ItemHeight; ScrollInfo.nPage = ((rcClient.bottom - rcClient.top) + infoPtr->ItemHeight - 1) / infoPtr->ItemHeight;
ScrollInfo.nPos = 0; ScrollInfo.nPos = 0;
ScrollInfo.nTrackPos = 0; ScrollInfo.nTrackPos = 0;
VisibleItems = (rcClient.bottom - rcClient.top) / infoPtr->ItemHeight;
if (ScrollInfo.nPage == VisibleItems && ScrollInfo.nMax > 0)
{
ScrollInfo.nMax--;
}
SetScrollInfo(infoPtr->hSelf,
SB_VERT,
&ScrollInfo,
TRUE);
if (AllowChangeStyle) if (AllowChangeStyle)
{ {
@ -464,26 +476,21 @@ UpdateControl(IN PCHECKLISTWND infoPtr,
GWL_STYLE); GWL_STYLE);
/* determine whether the vertical scrollbar has to be visible or not */ /* determine whether the vertical scrollbar has to be visible or not */
if (ScrollInfo.nMax > ScrollInfo.nPage && if (ScrollInfo.nMax > VisibleItems &&
!(Style & WS_VSCROLL)) !(Style & WS_VSCROLL))
{ {
SetWindowLong(infoPtr->hSelf, SetWindowLong(infoPtr->hSelf,
GWL_STYLE, GWL_STYLE,
Style | WS_VSCROLL); Style | WS_VSCROLL);
} }
else if (ScrollInfo.nMax < ScrollInfo.nPage && else if (ScrollInfo.nMax <= VisibleItems &&
Style & WS_VSCROLL) (Style & WS_VSCROLL))
{ {
SetWindowLong(infoPtr->hSelf, SetWindowLong(infoPtr->hSelf,
GWL_STYLE, GWL_STYLE,
Style & ~WS_VSCROLL); Style & ~WS_VSCROLL);
} }
} }
SetScrollInfo(infoPtr->hSelf,
SB_VERT,
&ScrollInfo,
TRUE);
RedrawWindow(infoPtr->hSelf, RedrawWindow(infoPtr->hSelf,
NULL, NULL,