<html>
<head>
<style>
<!--
body { background-color:#ffffff }
.file { border:1px solid #eeeeee; margin-top:1em; margin-bottom:1em }
.pathname { font-family:monospace; float:right }
.fileheader { margin-bottom:.5em }
.diff { margin:0 }
.tasklist { padding:4px; border:1px dashed #000000; margin-top:1em }
.tasklist ul { margin-top:0; margin-bottom:0 }
tr.alt { background-color:#eeeeee }
#added { background-color:#ddffdd }
#addedchars { background-color:#99ff99; font-weight:bolder }
tr.alt #added { background-color:#ccf7cc }
#removed { background-color:#ffdddd }
#removedchars { background-color:#ff9999; font-weight:bolder }
tr.alt #removed { background-color:#f7cccc }
#info { color:#888888 }
#context { background-color:#eeeeee }
td {padding-left:.3em; padding-right:.3em }
tr.head { border-bottom-width:1px; border-bottom-style:solid }
tr.head td { padding:0; padding-top:.2em }
.task { background-color:#ffff00 }
.comment { padding:4px; border:1px dashed #000000; background-color:#ffffdd }
.error { color:red }
hr { border-width:0px; height:2px; background:black }
-->
</style>
</head>
<body>
<pre class="comment">handle resizing of the control</pre><pre class="diff" id="context">Modified: trunk/reactos/lib/aclui/checklist.c
</pre><hr /><div class="file">
<div class="fileheader"><big><b>Modified: trunk/reactos/lib/aclui/checklist.c</b></big></div>
<pre class="diff"><small id="info">--- trunk/reactos/lib/aclui/checklist.c 2005-07-04 09:46:50 UTC (rev 16405)
+++ trunk/reactos/lib/aclui/checklist.c 2005-07-04 11:05:04 UTC (rev 16406)
@@ -63,8 +63,8 @@
</small></pre><pre class="diff" id="context"> #endif
} CHECKLISTWND, *PCHECKLISTWND;
</pre><pre class="diff" id="removed">-#define CI_TEXT_MARGIN_WIDTH (6)
-#define CI_TEXT_MARGIN_<span id="removedchars">HEIGHT (2</span>)
</pre><pre class="diff" id="added">+#define CI_TEXT_MARGIN_<span id="addedchars">WIDTH (8</span>)
+#define CI_TEXT_MARGIN_HEIGHT (3)
</pre><pre class="diff" id="context">
static PCHECKITEM
FindCheckItemByIndex(IN PCHECKLISTWND infoPtr,
@@ -153,10 +153,9 @@
</pre><pre class="diff" id="context"> {
/* return the Deny checkbox in case both check boxes are enabled! */
*CheckBox = ((!(LastEnabledItem->State & CIS_DENYDISABLED)) ? CLB_DENY : CLB_ALLOW);
</pre><pre class="diff" id="removed">- return LastEnabledItem;
</pre><pre class="diff" id="context"> }
</pre><pre class="diff" id="removed">- return <span id="removedchars">NULL</span>;
</pre><pre class="diff" id="added">+ return <span id="addedchars">LastEnabledItem</span>;
</pre><pre class="diff" id="context"> }
static PCHECKITEM
@@ -631,7 +630,7 @@
</pre><pre class="diff" id="context"> }
else
{
</pre><pre class="diff" id="removed">- height = <span id="removedchars">0</span>;
</pre><pre class="diff" id="added">+ height = <span id="addedchars">2</span>;
</pre><pre class="diff" id="context"> }
SelectObject(hdc,
@@ -655,7 +654,7 @@
</pre><pre class="diff" id="context">
if (hOldFont != hFont)
{
</pre><pre class="diff" id="removed">- infoPtr->ItemHeight = <span id="removedchars">4</span> + GetIdealItemHeight(infoPtr);
</pre><pre class="diff" id="added">+ infoPtr->ItemHeight = <span id="addedchars">(2 * CI_TEXT_MARGIN_HEIGHT)</span> + GetIdealItemHeight(infoPtr);
</pre><pre class="diff" id="context"> }
UpdateControl(infoPtr,
@@ -762,7 +761,7 @@
</pre><pre class="diff" id="context"> Item != NULL && CurrentIndex <= LastTouchedIndex;
Item = Item->Next, CurrentIndex++)
{
</pre><pre class="diff" id="removed">- TextRect.bottom = TextRect.top + infoPtr->ItemHeight;
</pre><pre class="diff" id="added">+ TextRect.bottom = TextRect.top + infoPtr->ItemHeight<span id="addedchars"> - (2 * CI_TEXT_MARGIN_HEIGHT)</span>;
</pre><pre class="diff" id="context"> ItemRect.bottom = ItemRect.top + infoPtr->ItemHeight;
SetBrushOrgEx(hDC,
@@ -789,15 +788,16 @@
</pre><pre class="diff" id="context"> &TextRect,
DT_LEFT | DT_NOPREFIX | DT_SINGLELINE | DT_VCENTER);
</pre><pre class="diff" id="added">+ CheckBox.top = TextRect.top;
+ CheckBox.bottom = TextRect.bottom;
+
</pre><pre class="diff" id="context"> /* draw the Allow checkbox */
IsPushed = (Enabled && Item == infoPtr->FocusedCheckItem && infoPtr->HasFocus &&
!(Item->State & CIS_ALLOWDISABLED) && infoPtr->FocusedCheckItemBox != CLB_DENY &&
infoPtr->FocusedPushed);
CheckBox.left = infoPtr->CheckBoxLeft[CLB_ALLOW] - ((TextRect.bottom - TextRect.top) / 2);
</pre><pre class="diff" id="removed">- CheckBox.right = CheckBox.left + (TextRect.bottom - TextRect.top) - (2 * CI_TEXT_MARGIN_HEIGHT);
- CheckBox.top = TextRect.top;
- CheckBox.<span id="removedchars">bottom = CheckBox.top + (TextRect.bottom - TextRect.top) - (2 * CI_TEXT_MARGIN_HEIGHT</span>);
</pre><pre class="diff" id="added">+ CheckBox.<span id="addedchars">right = CheckBox.left + (TextRect.bottom - TextRect.top</span>);
</pre><pre class="diff" id="context"> #if SUPPORT_UXTHEME
if (infoPtr->ThemeHandle != NULL)
{
@@ -853,7 +853,7 @@
</pre><pre class="diff" id="context"> infoPtr->FocusedPushed);
CheckBox.left = infoPtr->CheckBoxLeft[CLB_DENY] - ((TextRect.bottom - TextRect.top) / 2);
</pre><pre class="diff" id="removed">- CheckBox.right = CheckBox.left + (TextRect.bottom - TextRect.top)<span id="removedchars"> - (2 * CI_TEXT_MARGIN_HEIGHT)</span>;
</pre><pre class="diff" id="added">+ CheckBox.right = CheckBox.left + (TextRect.bottom - TextRect.top);
</pre><pre class="diff" id="context"> #if SUPPORT_UXTHEME
if (infoPtr->ThemeHandle != NULL)
{
@@ -1111,7 +1111,7 @@
</pre><pre class="diff" id="context">
#if SUPPORT_UXTHEME
/* handle hovering checkboxes */
</pre><pre class="diff" id="removed">- if (hWndCapture == NULL)
</pre><pre class="diff" id="added">+ if (hWndCapture == NULL<span id="addedchars"> && infoPtr->ThemeHandle != NULL</span>)
</pre><pre class="diff" id="context"> {
TRACKMOUSEEVENT tme;
PCHECKITEM HotTrackItem;
@@ -1547,6 +1547,8 @@
</pre><pre class="diff" id="context"> infoPtr->HasFocus = FALSE;
if (infoPtr->FocusedCheckItem != NULL)
{
</pre><pre class="diff" id="added">+ infoPtr->FocusedPushed = FALSE;
+
</pre><pre class="diff" id="context"> UpdateCheckItem(infoPtr,
infoPtr->FocusedCheckItem);
}
@@ -1836,6 +1838,13 @@
</pre><pre class="diff" id="context"> #endif
break;
}
</pre><pre class="diff" id="added">+
+ case WM_SIZE:
+ {
+ UpdateControl(infoPtr,
+ TRUE);
+ break;
+ }
</pre><pre class="diff" id="context">
case WM_CREATE:
{
</pre>
</div>
</body>
</html>