Changeset 34161 in webkit

Timestamp:

May 27, 2008 7:45:01 PM (16 years ago)

Author:

timothy@apple.com

Message:

Fixes a regression where the Image and Font preview views do not
size correctly.

<rdar://problem/5966723> REGRESSION (r33991): Image and font previews
are shrunken and can't be made larger (19281)

Reviewed by Adam Roben.

• page/inspector/FontView.js: Adjust the font size based only on the

container width minus padding.

• page/inspector/inspector.css: Updated styles for the image and

font views.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/inspector/FontView.js (modified) (2 diffs)
• page/inspector/inspector.css (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-05-27  Timothy Hatcher  <timothy@apple.com>
+
+        Fixes a regression where the Image and Font preview views do not
+        size correctly.
+
+        <rdar://problem/5966723> REGRESSION (r33991): Image and font previews
+        are shrunken and can't be made larger (19281)
+
+        Reviewed by Adam Roben.
+
+        * page/inspector/FontView.js: Adjust the font size based only on the
+        container width minus padding.
+        * page/inspector/inspector.css: Updated styles for the image and
+        font views.
+
 2008-05-27  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/page/inspector/FontView.js

@@ -72 +72 @@
         var width = this.fontPreviewElement.offsetWidth;
 
-        var containerHeight = this.contentElement.offsetHeight;
         var containerWidth = this.contentElement.offsetWidth;
 
-        if (!height || !width || !containerHeight || !containerWidth) {
+        // Subtract some padding. This should match the padding in the CSS plus room for the scrollbar.
+        containerWidth -= 40;
+
+        if (!height || !width || !containerWidth) {
             this.fontPreviewElement.style.removeProperty("font-size");
             this.fontPreviewElement.style.removeProperty("position");
@@ -86 +88 @@
         var fontSizeLineRatio = measureFontSize / realLineHeight;
         var widthRatio = containerWidth / width;
-        var heightRatio = containerHeight / height;
-
-        if (heightRatio < widthRatio)
-            var finalFontSize = Math.floor(realLineHeight * heightRatio * fontSizeLineRatio) - 1;
-        else
-            var finalFontSize = Math.floor(realLineHeight * widthRatio * fontSizeLineRatio) - 1;
+        var finalFontSize = Math.floor(realLineHeight * widthRatio * fontSizeLineRatio) - 1;
 
         this.fontPreviewElement.style.setProperty("font-size", finalFontSize + "px", null);

trunk/WebCore/page/inspector/inspector.css

@@ -650 +650 @@
 }
 
-.resource-view.font {
+.resource-view.font .resource-view-content {
     font-size: 60px;
     white-space: pre-wrap;
     word-wrap: break-word;
     text-align: center;
-}
-
-.resource-view.font .preview {
-    position: absolute;
-    margin-top: auto;
-    margin-bottom: auto;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
+    padding: 15px;
 }
 
 .resource-view.image .resource-view-content > .image {
-    position: relative;
-    height: 70%;
-    padding: 20px;
+    padding: 20px 20px 10px 20px;
+    text-align: center;
 }
 
 .resource-view.image .resource-view-content > .info {
-    position: relative;
-    height: 30%;
-    padding-top: 10px;
-    overflow: auto;
+    padding-bottom: 10px;
     font-size: 11px;
+    -webkit-user-select: text;
 }
 
 .resource-view.image img {
-    margin: auto;
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    max-width: 80%;
-    max-height: 80%;
+    max-width: 100%;
+    max-height: 1000px;
     background-image: url(Images/checker.png);
     -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.5);
+    -webkit-user-select: text;
+    -webkit-user-drag: auto;
 }
 
@@ -708 +692 @@
     width: 50%;
     text-align: right;
+    color: rgb(76, 76, 76);
 }
 
 .resource-view.image .infoList dd {
     display: inline-block;
-    padding-left: 10px;
+    padding-left: 8px;
     width: 50%;
     text-align: left;