Changeset 141260 in webkit
- Timestamp:
- Jan 30, 2013 6:03:32 AM (11 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r141258 r141260 1 2013-01-30 Pavel Feldman <pfeldman@chromium.org> 2 3 Web Inspector: beautify file selector dialog to render as two rows 4 https://bugs.webkit.org/show_bug.cgi?id=108335 5 6 Reviewed by Vsevolod Vlasov. 7 8 Go-to-file is now rendered in two rows. 9 10 * inspector/front-end/FilteredItemSelectionDialog.js: 11 (WebInspector.FilteredItemSelectionDialog): 12 (WebInspector.FilteredItemSelectionDialog.prototype.focus): 13 (WebInspector.FilteredItemSelectionDialog.prototype.renderAsTwoRows): 14 (WebInspector.FilteredItemSelectionDialog.prototype._createItemElement): 15 (WebInspector.OpenResourceDialog.show): 16 * inspector/front-end/ViewportControl.js: 17 (WebInspector.ViewportControl): 18 (WebInspector.ViewportControl.prototype.refresh): 19 * inspector/front-end/filteredItemSelectionDialog.css: 20 (.filtered-item-list-dialog > input): 21 (.filtered-item-list-dialog > div.progress): 22 (.filtered-item-list-dialog > div.container): 23 (.filtered-item-list-dialog-item): 24 (.filtered-item-list-dialog-subtitle): 25 (.filtered-item-list-dialog-item.one-row .filtered-item-list-dialog-subtitle): 26 (.filtered-item-list-dialog-item.two-rows): 27 (.filtered-item-list-dialog-item.selected): 28 (.filtered-item-list-dialog-item span.highlight): 29 1 30 2013-01-30 Pavel Feldman <pfeldman@chromium.org> 2 31 -
trunk/Source/WebCore/inspector/front-end/FilteredItemSelectionDialog.js
r141258 r141260 44 44 45 45 this.element = document.createElement("div"); 46 this.element.className = " js-outline-dialog";46 this.element.className = "filtered-item-list-dialog"; 47 47 this.element.addEventListener("keydown", this._onKeyDown.bind(this), false); 48 48 var styleElement = this.element.createChild("style"); … … 94 94 { 95 95 WebInspector.setCurrentFocusElement(this._promptElement); 96 if (this._filteredItems.length && !this._viewportControl.lastVisibleIndex())96 if (this._filteredItems.length && this._viewportControl.lastVisibleIndex() === -1) 97 97 this._viewportControl.refresh(); 98 98 }, … … 105 105 if (this._filterTimer) 106 106 clearTimeout(this._filterTimer); 107 }, 108 109 renderAsTwoRows: function() 110 { 111 this._renderAsTwoRows = true; 107 112 }, 108 113 … … 140 145 { 141 146 var itemElement = document.createElement("div"); 142 itemElement.className = " item";147 itemElement.className = "filtered-item-list-dialog-item " + (this._renderAsTwoRows ? "two-rows" : "one-row"); 143 148 itemElement._titleElement = itemElement.createChild("span"); 144 149 itemElement._titleElement.textContent = this._delegate.itemTitleAt(index); 145 150 itemElement._titleSuffixElement = itemElement.createChild("span"); 146 151 itemElement._titleSuffixElement.textContent = this._delegate.itemSuffixAt(index); 147 itemElement._subtitleElement = itemElement.createChild(" span", "subtitle");152 itemElement._subtitleElement = itemElement.createChild("div", "filtered-item-list-dialog-subtitle"); 148 153 itemElement._subtitleElement.textContent = this._delegate.itemSubtitleAt(index); 149 154 itemElement._index = index; … … 638 643 639 644 var filteredItemSelectionDialog = new WebInspector.FilteredItemSelectionDialog(new WebInspector.OpenResourceDialog(panel)); 645 filteredItemSelectionDialog.renderAsTwoRows(); 640 646 WebInspector.Dialog.show(relativeToElement, filteredItemSelectionDialog); 641 647 } -
trunk/Source/WebCore/inspector/front-end/ViewportControl.js
r141258 r141260 45 45 this.element.addEventListener("scroll", this._onScroll.bind(this), false); 46 46 this._firstVisibleIndex = 0; 47 this._lastVisibleIndex = 0;47 this._lastVisibleIndex = -1; 48 48 } 49 49 … … 79 79 refresh: function() 80 80 { 81 if (!this.element.clientHeight) 82 return; // Do nothing for invisible controls. 83 81 84 var itemCount = this._provider.itemCount(); 82 85 … … 90 93 91 94 this._firstVisibleIndex = Math.floor(visibleFrom / this._rowHeight); 92 this._lastVisibleIndex = Math.m ax(0, Math.min(Math.ceil(visibleTo / this._rowHeight), itemCount) - 1);95 this._lastVisibleIndex = Math.min(Math.ceil(visibleTo / this._rowHeight), itemCount) - 1; 93 96 this._topGapElement.style.height = (this._rowHeight * this._firstVisibleIndex) + "px"; 94 97 this._bottomGapElement.style.height = (this._rowHeight * (itemCount - this._lastVisibleIndex - 1)) + "px"; -
trunk/Source/WebCore/inspector/front-end/filteredItemSelectionDialog.css
r141258 r141260 1 . js-outline-dialog > input {1 .filtered-item-list-dialog > input { 2 2 font-size: 11px; 3 3 width: 100%; … … 5 5 } 6 6 7 . js-outline-dialog > div.progress {7 .filtered-item-list-dialog > div.progress { 8 8 position: absolute; 9 9 top: 35px; … … 13 13 } 14 14 15 . js-outline-dialog > div.container {15 .filtered-item-list-dialog > div.container { 16 16 position: absolute; 17 17 top: 38px; … … 24 24 } 25 25 26 . js-outline-dialog > .container > div.item {26 .filtered-item-list-dialog-item { 27 27 padding: 2px; 28 28 white-space: nowrap; … … 32 32 } 33 33 34 . js-outline-dialog span.subtitle {34 .filtered-item-list-dialog-subtitle { 35 35 color: rgb(155, 155, 155); 36 padding-right: 2px; 36 } 37 38 .filtered-item-list-dialog-item.one-row .filtered-item-list-dialog-subtitle { 37 39 float: right; 38 40 } 39 41 40 .js-outline-dialog .container div.item.selected { 42 .filtered-item-list-dialog-item.two-rows { 43 border-bottom: 1px solid rgb(235, 235, 235); 44 } 45 46 .filtered-item-list-dialog-item.selected { 41 47 background-color: rgb(224, 224, 224); 42 48 } 43 49 44 . js-outline-dialog .container div.item span.highlight {50 .filtered-item-list-dialog-item span.highlight { 45 51 color: black; 46 52 font-weight: bold;
Note: See TracChangeset
for help on using the changeset viewer.