Changeset 53996 in webkit

Timestamp:

Jan 28, 2010 4:34:02 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-28 Mikhail Naganov <​mnaganov@chromium.org>

Reviewed by Timothy Hatcher.

Simplify views logic in Profiler panel, and fix the problem described in the issue.
Remove image from Welcome view.
Preserve border on status bar-like buttons in Welcome view on window deactivation.

​https://bugs.webkit.org/show_bug.cgi?id=34201

• inspector/front-end/ProfilesPanel.js: (WebInspector.ProfilesPanel.prototype.show): (WebInspector.ProfilesPanel.prototype.reset): (WebInspector.ProfilesPanel.prototype.addProfileHeader): (WebInspector.ProfilesPanel.prototype.showView): (WebInspector.ProfilesPanel.prototype._updateInterface):
• inspector/front-end/WelcomeView.js: (WebInspector.WelcomeView):
• inspector/front-end/inspector.css:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/ProfilesPanel.js (modified) (7 diffs)
• inspector/front-end/WelcomeView.js (modified) (2 diffs)
• inspector/front-end/inspector.css (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-28  Mikhail Naganov  <mnaganov@chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Simplify views logic in Profiler panel, and fix the problem described in the issue.
+        Remove image from Welcome view.
+        Preserve border on status bar-like buttons in Welcome view on window deactivation.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34201
+
+        * inspector/front-end/ProfilesPanel.js:
+        (WebInspector.ProfilesPanel.prototype.show):
+        (WebInspector.ProfilesPanel.prototype.reset):
+        (WebInspector.ProfilesPanel.prototype.addProfileHeader):
+        (WebInspector.ProfilesPanel.prototype.showView):
+        (WebInspector.ProfilesPanel.prototype._updateInterface):
+        * inspector/front-end/WelcomeView.js:
+        (WebInspector.WelcomeView):
+        * inspector/front-end/inspector.css:
+
 2010-01-18  Holger Hans Peter Freyther  <zecke@selfish.org>
 

trunk/WebCore/inspector/front-end/ProfilesPanel.js

@@ -158 +158 @@
     {
         WebInspector.Panel.prototype.show.call(this);
-        this._updateInterface();
-        if (!this.visibleView) {
-            this.visibleView = this.welcomeView;
-            this.welcomeView.show();
-        }
-        this.visibleView.show();
         if (this._shouldPopulateProfiles)
             this._populateProfiles();
@@ -191 +185 @@
         for (var i = 0; i < this._profiles.length; ++i)
             delete this._profiles[i]._profileView;
+        delete this.visibleView;
 
         delete this.currentQuery;
@@ -210 +205 @@
 
         this._updateInterface();
+        this.welcomeView.show();
     },
 
@@ -308 +304 @@
 
         sidebarParent.appendChild(profileTreeElement);
-        if (!this.visibleView || this.visibleView === this.welcomeView)
+        this.welcomeView.hide();
+        if (!this.visibleView)
             this.showProfile(profile);
     },
@@ -337 +334 @@
     showView: function(view)
     {
-        if (this.visibleView === view) {
-            if (this.visibleView && !this.visibleView.visible)
-                view.show();
-            return;
-        }
-
-        this._previousVisibleView = this.visibleView;
-        if (view === this.welcomeView) {
-            this.closeVisibleView();
-            this.visibleView = view;
-            view.show();
-        } else
-            this.showProfile(view.profile);
+        this.showProfile(view.profile);
     },
 
@@ -452 +437 @@
             this.profileViewStatusBarItemsContainer.removeStyleClass("hidden");
             this.panelEnablerView.visible = false;
-            this.welcomeView.visible = true;
-            this.visibleView = this._previousVisibleView || this.welcomeView;
         } else {
             this.enableToggleButton.title = WebInspector.UIString("Profiling disabled. Click to enable.");
@@ -460 +443 @@
                 this._profileTypeButtonsByIdMap[typeId].addStyleClass("hidden");
             this.profileViewStatusBarItemsContainer.addStyleClass("hidden");
-            this.welcomeView.visible = false;
             this.panelEnablerView.visible = true;
-            this.visibleView = this.panelEnablerView;
         }
     },

trunk/WebCore/inspector/front-end/WelcomeView.js

@@ -40 +40 @@
     this.element.appendChild(this.contentElement);
 
-    this.imageElement = document.createElement("img");
-    this.contentElement.appendChild(this.imageElement);
+    this.alignerElement = document.createElement("div");
+    this.alignerElement.className = "welcome-instructions-aligner";
+    this.contentElement.appendChild(this.alignerElement);
 
     this.instructionsElement = document.createElement("div");
@@ -56 +57 @@
 
 WebInspector.WelcomeView.prototype = {
-
-    show: function(parentElement)
-    {
-        WebInspector.View.prototype.show.call(this, parentElement);
-
-        setTimeout(this.resize.bind(this), 0);
-    },
-
-    resize: function()
-    {
-        this.imageElement.removeStyleClass("hidden");
-
-        if (this.element.offsetWidth < (this.instructionsElement.offsetWidth + this.imageElement.offsetWidth))
-            this.imageElement.addStyleClass("hidden");
-    },
-
     addMessage: function(message)
     {

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

@@ -2239 +2239 @@
 }
 
-.panel-enabler-view img {
+.panel-enabler-view img, div.welcome-instructions-aligner {
     height: 100%;
     min-height: 200px;
@@ -2293 +2293 @@
 }
 
-.panel-enabler-view.welcome img {
-    height: 90%;
-    min-height: 180px;
-    max-width: 90%;
+.panel-enabler-view.welcome div.welcome-instructions-aligner {
+    display: inline-block;
+    width: 0;
 }
 
@@ -2304 +2303 @@
     width: 330px;
     margin: 0;
-    padding: 15px;
     white-space: normal;
     line-height: 175%;
@@ -2322 +2320 @@
 }
 
-.panel-enabler-view button:active, .pane button:active {
+.panel-enabler-view button:active:not(.status-bar-item), .pane button:active {
     background-color: rgb(215, 215, 215);
     background-image: -webkit-gradient(linear, left top, left bottom, from(rgb(194, 194, 194)), to(rgb(239, 239, 239)));
 }
 
-body.inactive .panel-enabler-view button, .panel-enabler-view button:disabled, body.inactive .pane button, .pane button:disabled {
+body.inactive .panel-enabler-view button:not(.status-bar-item), .panel-enabler-view button:disabled:not(.status-bar-item), body.inactive .pane button, .pane button:disabled {
     color: rgb(130, 130, 130);
     border-color: rgb(212, 212, 212);