Changeset 80348 in webkit

Timestamp:

Mar 4, 2011 6:51:24 AM (13 years ago)

Author:

podivilov@chromium.org

Message:

2011-03-02 Andrey Adaikin <​aandrey@google.com>

Reviewed by Pavel Feldman.

Web Inspector: Gutter height should be 100% when few lines are displayed
​https://bugs.webkit.org/show_bug.cgi?id=55574

• inspector/front-end/SourceFrame.js: (WebInspector.SourceFrame.prototype._startEditing):
• inspector/front-end/TextViewer.js: (WebInspector.TextViewer.prototype._syncScroll): (WebInspector.TextEditorGutterPanel.prototype._expandChunks): (WebInspector.TextEditorGutterPanel.prototype.textChanged): (WebInspector.TextEditorGutterPanel.prototype.syncClientHeight):
• inspector/front-end/textViewer.css: (.text-editor-lines): (.text-editor-contents .inner-container): (.webkit-line-number):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/TextViewer.js (modified) (3 diffs)
• inspector/front-end/textViewer.css (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-02  Andrey Adaikin  <aandrey@google.com>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: Gutter height should be 100% when few lines are displayed
+        https://bugs.webkit.org/show_bug.cgi?id=55574
+
+        * inspector/front-end/SourceFrame.js:
+        (WebInspector.SourceFrame.prototype._startEditing):
+        * inspector/front-end/TextViewer.js:
+        (WebInspector.TextViewer.prototype._syncScroll):
+        (WebInspector.TextEditorGutterPanel.prototype._expandChunks):
+        (WebInspector.TextEditorGutterPanel.prototype.textChanged):
+        (WebInspector.TextEditorGutterPanel.prototype.syncClientHeight):
+        * inspector/front-end/textViewer.css:
+        (.text-editor-lines):
+        (.text-editor-contents .inner-container):
+        (.webkit-line-number):
+
 2011-03-04  Andrey Adaikin  <aandrey@google.com>
 

trunk/Source/WebCore/inspector/front-end/TextViewer.js

@@ -202 +202 @@
             var mainElement = this._mainPanel.element;
             var gutterElement = this._gutterPanel.element;
-
             // Handle horizontal scroll bar at the bottom of the main panel.
-            if (gutterElement.offsetHeight > mainElement.clientHeight)
-                this._gutterPanel._container.style.setProperty("padding-bottom", (gutterElement.offsetHeight - mainElement.clientHeight) + "px");
-            else
-                this._gutterPanel._container.style.removeProperty("padding-bottom");
-
+            this._gutterPanel.syncClientHeight(mainElement.clientHeight);
             gutterElement.scrollTop = mainElement.scrollTop;
         }.bind(this), 0);
@@ -494 +489 @@
         for (var i = 0; i < this._textChunks.length; ++i)
             this._textChunks[i].expanded = (fromIndex <= i && i < toIndex);
-        this.element.style.setProperty("width", this._container.offsetWidth + "px");
     },
 
@@ -538 +532 @@
             }
         }
+    },
+
+    syncClientHeight: function(clientHeight)
+    {
+        if (this.element.offsetHeight > clientHeight)
+            this._container.style.setProperty("padding-bottom", (this.element.offsetHeight - clientHeight) + "px");
+        else
+            this._container.style.removeProperty("padding-bottom");
     }
 }

trunk/Source/WebCore/inspector/front-end/textViewer.css

@@ -16 +16 @@
     overflow: hidden;
     -webkit-user-select: none;
-}
-
-.inner-container {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: auto;
-    bottom: auto;
-    min-width: 100%;
+    background-color: rgb(240, 240, 240);
+    border-right: 1px solid rgb(187, 187, 187);
+    min-width: 19px;
 }
 
@@ -35 +29 @@
     overflow: auto;
     -webkit-user-select: text;
+}
+
+.text-editor-contents .inner-container {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: auto;
+    bottom: auto;
+    min-width: 100%;
 }
 
@@ -90 +93 @@
 .webkit-line-number {
     color: rgb(128, 128, 128);
-    background-color: rgb(240, 240, 240);
-    border-right: 1px solid rgb(187, 187, 187);
     text-align: right;
     vertical-align: top;