Changeset 275493 in webkit

Timestamp:

Apr 6, 2021 12:28:30 AM (3 years ago)

Author:

Razvan Caliman

Message:

Web Inspector: Layout sidebar grid overlay color swatch tooltip shouldn't include "switch format" hint
​https://bugs.webkit.org/show_bug.cgi?id=223418
<rdar://problem/75825793>

Reviewed by BJ Burg.

• UserInterface/Views/CSSGridSection.js:

(WI.CSSGridSection.prototype.layout):

• UserInterface/Views/InlineSwatch.js:

(WI.InlineSwatch):
(WI.InlineSwatch.prototype.set shiftClickColorEnabled):
(WI.InlineSwatch.prototype._updateSwatch):
(WI.InlineSwatch.prototype._allowChangingColorFormats):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/CSSGridSection.js (modified) (1 diff)
• UserInterface/Views/InlineSwatch.js (modified) (5 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2021-04-06  Razvan Caliman  <rcaliman@apple.com>
+
+        Web Inspector: Layout sidebar grid overlay color swatch tooltip shouldn't include "switch format" hint
+        https://bugs.webkit.org/show_bug.cgi?id=223418
+        <rdar://problem/75825793>
+
+        Reviewed by BJ Burg.
+
+        * UserInterface/Views/CSSGridSection.js:
+        (WI.CSSGridSection.prototype.layout):
+        * UserInterface/Views/InlineSwatch.js:
+        (WI.InlineSwatch):
+        (WI.InlineSwatch.prototype.set shiftClickColorEnabled):
+        (WI.InlineSwatch.prototype._updateSwatch):
+        (WI.InlineSwatch.prototype._allowChangingColorFormats):
+
 2021-03-31  Patrick Angle  <pangle@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Views/CSSGridSection.js

@@ -137 +137 @@
             let gridColor = WI.overlayManager.getGridColorForNode(domNode);
             let swatch = new WI.InlineSwatch(WI.InlineSwatch.Type.Color, gridColor);
+            swatch.shiftClickColorEnabled = false;
             itemContainerElement.append(swatch.element);
 

trunk/Source/WebInspectorUI/UserInterface/Views/InlineSwatch.js

@@ -67 +67 @@
 
             case WI.InlineSwatch.Type.Color:
+                this._shiftClickColorEnabled = true;
                 // Handled later by _updateSwatch.
                 break;
@@ -122 +123 @@
     {
         this._value = value;
+        this._updateSwatch(true);
+    }
+
+    set shiftClickColorEnabled(value)
+    {
+        this._shiftClickColorEnabled = !!value;
         this._updateSwatch(true);
     }
@@ -181 +188 @@
 
         if (this._type === WI.InlineSwatch.Type.Color) {
-            if (this._allowShiftClickColor())
+            if (this._allowChangingColorFormats())
                 this._swatchElement.title = WI.UIString("Click to select a color\nShift-click to switch color formats");
             else
@@ -191 +198 @@
     }
 
-    _allowShiftClickColor()
-    {
-        return !this._readOnly && !this.value.isOutsideSRGB();
+    _allowChangingColorFormats()
+    {
+        return this._shiftClickColorEnabled && !this._readOnly && !this.value.isOutsideSRGB();
     }
 
@@ -204 +211 @@
         if (event.shiftKey && value) {
             if (this._type === WI.InlineSwatch.Type.Color) {
-                if (!this._allowShiftClickColor()) {
+                if (!this._allowChangingColorFormats()) {
                     InspectorFrontendHost.beep();
                     return;