<!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>[197076] releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI</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/197076">197076</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-25 01:48:09 -0800 (Thu, 25 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/196863">r196863</a> - Web Inspector: Text Align segmented control blinks while editing other properties in Visual Styles sidebar
https://bugs.webkit.org/show_bug.cgi?id=154487
<rdar://problem/24754703>
Patch by Devin Rousso <dcrousso+webkit@gmail.com> on 2016-02-20
Reviewed by Timothy Hatcher.
The icon list property editor blinking issue was caused by the fact that
the selected value was toggled on/off each time the value was set on the
editor. In order to prevent this, the logic for the setter value() was
modified to just match a keyword icon to the given value and select it.
* UserInterface/Views/VisualStyleKeywordIconList.js:
(WebInspector.VisualStyleKeywordIconList.prototype.set value):
(WebInspector.VisualStyleKeywordIconList.prototype._handleKeywordChanged):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212SourceWebInspectorUIChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebInspectorUIUserInterfaceViewsVisualStyleKeywordIconListjs">releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Views/VisualStyleKeywordIconList.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212SourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/ChangeLog (197075 => 197076)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/ChangeLog 2016-02-25 09:47:04 UTC (rev 197075)
+++ releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/ChangeLog 2016-02-25 09:48:09 UTC (rev 197076)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-02-20 Devin Rousso <dcrousso+webkit@gmail.com>
+
+ Web Inspector: Text Align segmented control blinks while editing other properties in Visual Styles sidebar
+ https://bugs.webkit.org/show_bug.cgi?id=154487
+ <rdar://problem/24754703>
+
+ Reviewed by Timothy Hatcher.
+
+ The icon list property editor blinking issue was caused by the fact that
+ the selected value was toggled on/off each time the value was set on the
+ editor. In order to prevent this, the logic for the setter value() was
+ modified to just match a keyword icon to the given value and select it.
+
+ * UserInterface/Views/VisualStyleKeywordIconList.js:
+ (WebInspector.VisualStyleKeywordIconList.prototype.set value):
+ (WebInspector.VisualStyleKeywordIconList.prototype._handleKeywordChanged):
+
</ins><span class="cx"> 2016-02-20 Nikita Vasilyev <nvasilyev@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Placeholder text in Visual Styles sidebar table row should be white
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebInspectorUIUserInterfaceViewsVisualStyleKeywordIconListjs"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Views/VisualStyleKeywordIconList.js (197075 => 197076)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Views/VisualStyleKeywordIconList.js 2016-02-25 09:47:04 UTC (rev 197075)
+++ releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Views/VisualStyleKeywordIconList.js 2016-02-25 09:48:09 UTC (rev 197076)
</span><span class="lines">@@ -75,24 +75,22 @@
</span><span class="cx"> this._computedIcon = null;
</span><span class="cx"> this._selectedIcon = null;
</span><span class="cx"> for (let icon of this._iconElements) {
</span><ins>+ icon.classList.remove("selected", "computed");
+
</ins><span class="cx"> if (icon.id === this._updatedValues.placeholder)
</span><span class="cx"> this._computedIcon = icon;
</span><span class="cx">
</span><span class="cx"> if (icon.id === value && !this._propertyMissing)
</span><span class="cx"> this._selectedIcon = icon;
</span><del>- else
- icon.classList.remove("selected", "computed");
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!this._computedIcon)
</span><span class="cx"> this._computedIcon = this._iconElements[0];
</span><span class="cx">
</span><del>- let iconIsSelected = this._selectedIcon && this._selectedIcon.classList.toggle("selected");
- if (!iconIsSelected) {
- this._selectedIcon = null;
- this._propertyMissing = true;
</del><ins>+ if (this._selectedIcon)
+ this._selectedIcon.classList.add("selected");
+ else
</ins><span class="cx"> this._computedIcon.classList.add("computed");
</span><del>- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> get synthesizedValue()
</span><span class="lines">@@ -104,8 +102,9 @@
</span><span class="cx">
</span><span class="cx"> _handleKeywordChanged(event)
</span><span class="cx"> {
</span><del>- this._propertyMissing = false;
- this.value = event.target.id;
</del><ins>+ let toggleOff = this.value === event.target.id;
+ this._propertyMissing = toggleOff;
+ this.value = toggleOff ? null : event.target.id;
</ins><span class="cx"> this._valueDidChange();
</span><span class="cx"> }
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>