Changeset 197076 in webkit

Timestamp:

Feb 25, 2016, 1:48:09 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r196863 - 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 <Devin Rousso> 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):

Location:

releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/VisualStyleKeywordIconList.js (modified) (4 diffs)

releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+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):
+
 2016-02-20  Nikita Vasilyev  <nvasilyev@apple.com>
 

releases/WebKitGTK/webkit-2.12/Source/WebInspectorUI/UserInterface/Views/VisualStyleKeywordIconList.js

@@ -76 +76 @@
         this._selectedIcon = null;
         for (let icon of this._iconElements) {
+            icon.classList.remove("selected", "computed");
+
             if (icon.id === this._updatedValues.placeholder)
                 this._computedIcon = icon;
@@ -81 +83 @@
             if (icon.id === value && !this._propertyMissing)
                 this._selectedIcon = icon;
-            else
-                icon.classList.remove("selected", "computed");
         }
 
@@ -88 +88 @@
             this._computedIcon = this._iconElements[0];
 
-        let iconIsSelected = this._selectedIcon && this._selectedIcon.classList.toggle("selected");
-        if (!iconIsSelected) {
-            this._selectedIcon = null;
-            this._propertyMissing = true;
+        if (this._selectedIcon)
+            this._selectedIcon.classList.add("selected");
+        else
             this._computedIcon.classList.add("computed");
-        }
     }
 
@@ -105 +103 @@
     _handleKeywordChanged(event)
     {
-        this._propertyMissing = false;
-        this.value = event.target.id;
+        let toggleOff = this.value === event.target.id;
+        this._propertyMissing = toggleOff;
+        this.value = toggleOff ? null : event.target.id;
         this._valueDidChange();
     }