<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[37338] trunk/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/37338">37338</a></dd>
<dt>Author</dt> <dd>sfalken@apple.com</dd>
<dt>Date</dt> <dd>2008-10-06 12:55:09 -0700 (Mon, 06 Oct 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>        &lt;rdar://problem/6249833&gt; Fix default button appearance
        
        Reviewed by Adele Peterson.

        * rendering/RenderThemeWin.cpp:
        (WebCore::RenderThemeWin::supportsFocus):
        (WebCore::RenderThemeWin::determineClassicState):
        (WebCore::RenderThemeWin::determineButtonState):
        (WebCore::RenderThemeWin::getClassicThemeData):
        (WebCore::RenderThemeWin::getThemeData):
        (WebCore::drawControl):
        * rendering/RenderThemeWin.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorerenderingRenderThemeWincpp">trunk/WebCore/rendering/RenderThemeWin.cpp</a></li>
<li><a href="#trunkWebCorerenderingRenderThemeWinh">trunk/WebCore/rendering/RenderThemeWin.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (37337 => 37338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2008-10-06 18:31:07 UTC (rev 37337)
+++ trunk/WebCore/ChangeLog        2008-10-06 19:55:09 UTC (rev 37338)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2008-10-03  Steve Falkenburg  &lt;sfalken@apple.com&gt;
+
+        &lt;rdar://problem/6249833&gt; Fix default button appearance
+        
+        Reviewed by Adele Peterson.
+
+        * rendering/RenderThemeWin.cpp:
+        (WebCore::RenderThemeWin::supportsFocus):
+        (WebCore::RenderThemeWin::determineClassicState):
+        (WebCore::RenderThemeWin::determineButtonState):
+        (WebCore::RenderThemeWin::getClassicThemeData):
+        (WebCore::RenderThemeWin::getThemeData):
+        (WebCore::drawControl):
+        * rendering/RenderThemeWin.h:
+
</ins><span class="cx"> 2008-10-06  Tor Arne Vestbø  &lt;tavestbo@trolltech.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Simon.
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderThemeWincpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderThemeWin.cpp (37337 => 37338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderThemeWin.cpp        2008-10-06 18:31:07 UTC (rev 37337)
+++ trunk/WebCore/rendering/RenderThemeWin.cpp        2008-10-06 19:55:09 UTC (rev 37338)
</span><span class="lines">@@ -73,7 +73,14 @@
</span><span class="cx"> #define TUS_PRESSED     3
</span><span class="cx"> #define TUS_FOCUSED     4
</span><span class="cx"> #define TUS_DISABLED    5
</span><del>- 
</del><ins>+
+// button states
+#define PBS_NORMAL      1
+#define PBS_HOT         2
+#define PBS_PRESSED     3
+#define PBS_DISABLED    4
+#define PBS_DEFAULTED   5
+
</ins><span class="cx"> // This is the fixed width IE and Firefox use for buttons on dropdown menus
</span><span class="cx"> static const int dropDownButtonWidth = 17;
</span><span class="cx"> 
</span><span class="lines">@@ -284,6 +291,7 @@
</span><span class="cx">     switch (appearance) {
</span><span class="cx">         case PushButtonAppearance:
</span><span class="cx">         case ButtonAppearance:
</span><ins>+        case DefaultButtonAppearance:
</ins><span class="cx">         case TextFieldAppearance:
</span><span class="cx">         case TextAreaAppearance:
</span><span class="cx">             return true;
</span><span class="lines">@@ -300,6 +308,7 @@
</span><span class="cx">     switch (o-&gt;style()-&gt;appearance()) {
</span><span class="cx">         case PushButtonAppearance:
</span><span class="cx">         case ButtonAppearance:
</span><ins>+        case DefaultButtonAppearance:
</ins><span class="cx">             state = DFCS_BUTTONPUSH;
</span><span class="cx">             if (!isEnabled(o))
</span><span class="cx">                 state |= DFCS_INACTIVE;
</span><span class="lines">@@ -360,12 +369,29 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+unsigned RenderThemeWin::determineButtonState(RenderObject* o)
+{
+    unsigned result = PBS_NORMAL;
+    if (!isEnabled(o))
+        result = PBS_DISABLED;
+    else if (supportsFocus(o-&gt;style()-&gt;appearance()) &amp;&amp; isFocused(o))
+        result = PBS_DEFAULTED;
+    else if (isPressed(o))
+        result = PBS_PRESSED;
+    else if (isHovered(o))
+        result = PBS_HOT;
+    else if (isDefault(o))
+        result = PBS_DEFAULTED;
+    return result;
+}
+
</ins><span class="cx"> ThemeData RenderThemeWin::getClassicThemeData(RenderObject* o)
</span><span class="cx"> {
</span><span class="cx">     ThemeData result;
</span><span class="cx">     switch (o-&gt;style()-&gt;appearance()) {
</span><span class="cx">         case PushButtonAppearance:
</span><span class="cx">         case ButtonAppearance:
</span><ins>+        case DefaultButtonAppearance:
</ins><span class="cx">         case CheckboxAppearance:
</span><span class="cx">         case RadioAppearance:
</span><span class="cx">             result.m_part = DFC_BUTTON;
</span><span class="lines">@@ -411,8 +437,9 @@
</span><span class="cx">     switch (o-&gt;style()-&gt;appearance()) {
</span><span class="cx">         case PushButtonAppearance:
</span><span class="cx">         case ButtonAppearance:
</span><ins>+        case DefaultButtonAppearance:
</ins><span class="cx">             result.m_part = BP_BUTTON;
</span><del>-            result.m_state = determineState(o);
</del><ins>+            result.m_state = determineButtonState(o);
</ins><span class="cx">             break;
</span><span class="cx">         case CheckboxAppearance:
</span><span class="cx">             result.m_part = BP_CHECKBOX;
</span><span class="lines">@@ -497,9 +524,16 @@
</span><span class="cx">                     ::FillRect(hdc, &amp;widgetRect, (HBRUSH)COLOR_3DHILIGHT);
</span><span class="cx">                 ::DeleteObject(patternBmp);
</span><span class="cx">             }
</span><del>-        } else
</del><ins>+        } else {
</ins><span class="cx">             // Push buttons, buttons, checkboxes and radios, and the dropdown arrow in menulists.
</span><ins>+            if (o-&gt;style()-&gt;appearance() == DefaultButtonAppearance) {
+                HBRUSH brush = ::GetSysColorBrush(COLOR_3DDKSHADOW);
+                ::FrameRect(hdc, &amp;widgetRect, brush);
+                ::InflateRect(&amp;widgetRect, -1, -1);
+                ::DrawEdge(hdc, &amp;widgetRect, BDR_RAISEDOUTER, BF_RECT | BF_MIDDLE);
+            }
</ins><span class="cx">             ::DrawFrameControl(hdc, &amp;widgetRect, themeData.m_part, themeData.m_state);
</span><ins>+        }
</ins><span class="cx">     }
</span><span class="cx">     context-&gt;releaseWindowsContext(hdc, r, alphaBlend);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderThemeWinh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderThemeWin.h (37337 => 37338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderThemeWin.h        2008-10-06 18:31:07 UTC (rev 37337)
+++ trunk/WebCore/rendering/RenderThemeWin.h        2008-10-06 19:55:09 UTC (rev 37338)
</span><span class="lines">@@ -117,7 +117,8 @@
</span><span class="cx"> 
</span><span class="cx">     unsigned determineState(RenderObject*);
</span><span class="cx">     unsigned determineClassicState(RenderObject*);
</span><del>-    unsigned determineSliderThumbState(RenderObject* o);
</del><ins>+    unsigned determineSliderThumbState(RenderObject*);
+    unsigned determineButtonState(RenderObject*);
</ins><span class="cx"> 
</span><span class="cx">     bool supportsFocus(EAppearance);
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>