mirror of
https://github.com/overte-org/overte.git
synced 2025-08-06 19:59:28 +02:00
more CR changes + fix resizing
This commit is contained in:
parent
15051364dc
commit
7e7dc33acd
2 changed files with 34 additions and 58 deletions
|
@ -100,7 +100,7 @@ function loaded() {
|
||||||
elEntityTable = document.getElementById("entity-table");
|
elEntityTable = document.getElementById("entity-table");
|
||||||
elEntityTableBody = document.getElementById("entity-table-body");
|
elEntityTableBody = document.getElementById("entity-table-body");
|
||||||
elEntityTableScroll = document.getElementById("entity-table-scroll");
|
elEntityTableScroll = document.getElementById("entity-table-scroll");
|
||||||
elEntityTableFooter = document.getElementById("entity-table-footer");
|
elEntityTableHeaderRow = document.querySelectorAll("#entity-table thead th");
|
||||||
elRefresh = document.getElementById("refresh");
|
elRefresh = document.getElementById("refresh");
|
||||||
elToggleLocked = document.getElementById("locked");
|
elToggleLocked = document.getElementById("locked");
|
||||||
elToggleVisible = document.getElementById("visible");
|
elToggleVisible = document.getElementById("visible");
|
||||||
|
@ -181,8 +181,8 @@ function loaded() {
|
||||||
|
|
||||||
elNoEntitiesInView.style.display = "none";
|
elNoEntitiesInView.style.display = "none";
|
||||||
|
|
||||||
entityList = new ListView("entity-table", "entity-table-body", "entity-table-scroll",
|
entityList = new ListView(elEntityTableHeaderRow, elEntityTableBody, elEntityTableScroll,
|
||||||
createRow, updateRow, clearRow, resize, WINDOW_NONVARIABLE_HEIGHT);
|
createRow, updateRow, clearRow, WINDOW_NONVARIABLE_HEIGHT);
|
||||||
|
|
||||||
function onRowClicked(clickEvent) {
|
function onRowClicked(clickEvent) {
|
||||||
let entityID = this.dataset.entityID;
|
let entityID = this.dataset.entityID;
|
||||||
|
@ -273,17 +273,17 @@ function loaded() {
|
||||||
type: type,
|
type: type,
|
||||||
url: filename,
|
url: filename,
|
||||||
fullUrl: entity.url,
|
fullUrl: entity.url,
|
||||||
locked: entity.locked ? LOCKED_GLYPH : null,
|
locked: entity.locked,
|
||||||
visible: entity.visible ? VISIBLE_GLYPH : null,
|
visible: entity.visible,
|
||||||
verticesCount: displayIfNonZero(entity.verticesCount),
|
verticesCount: displayIfNonZero(entity.verticesCount),
|
||||||
texturesCount: displayIfNonZero(entity.texturesCount),
|
texturesCount: displayIfNonZero(entity.texturesCount),
|
||||||
texturesSize: decimalMegabytes(entity.texturesSize),
|
texturesSize: decimalMegabytes(entity.texturesSize),
|
||||||
hasTransparent: entity.hasTransparent ? TRANSPARENCY_GLYPH : null,
|
hasTransparent: entity.hasTransparent,
|
||||||
isBaked: entity.isBaked ? BAKED_GLYPH : null,
|
isBaked: entity.isBaked,
|
||||||
drawCalls: displayIfNonZero(entity.drawCalls),
|
drawCalls: displayIfNonZero(entity.drawCalls),
|
||||||
hasScript: entity.hasScript ? SCRIPT_GLYPH : null,
|
hasScript: entity.hasScript,
|
||||||
elRow: null, // if this entity has a row element assigned to it
|
elRow: null, // if this entity has a visible row element assigned to it
|
||||||
selected: false
|
selected: false // if this entity is selected for edit regardless of having a visible row
|
||||||
}
|
}
|
||||||
|
|
||||||
entities.push(entityData);
|
entities.push(entityData);
|
||||||
|
@ -491,7 +491,8 @@ function loaded() {
|
||||||
|
|
||||||
function isGlyphColumn(columnIndex) {
|
function isGlyphColumn(columnIndex) {
|
||||||
return columnIndex === COLUMN_INDEX.LOCKED || columnIndex === COLUMN_INDEX.VISIBLE ||
|
return columnIndex === COLUMN_INDEX.LOCKED || columnIndex === COLUMN_INDEX.VISIBLE ||
|
||||||
columnIndex === COLUMN_INDEX.HAS_TRANSPARENT || columnIndex === COLUMN_INDEX.IS_BAKED;
|
columnIndex === COLUMN_INDEX.HAS_TRANSPARENT || columnIndex === COLUMN_INDEX.IS_BAKED ||
|
||||||
|
columnIndex === COLUMN_INDEX.HAS_SCRIPT;
|
||||||
}
|
}
|
||||||
|
|
||||||
function createRow() {
|
function createRow() {
|
||||||
|
@ -517,9 +518,9 @@ function loaded() {
|
||||||
let urlCell = elRow.childNodes[COLUMN_INDEX.URL];
|
let urlCell = elRow.childNodes[COLUMN_INDEX.URL];
|
||||||
urlCell.innerText = itemData.url;
|
urlCell.innerText = itemData.url;
|
||||||
let lockedCell = elRow.childNodes[COLUMN_INDEX.LOCKED];
|
let lockedCell = elRow.childNodes[COLUMN_INDEX.LOCKED];
|
||||||
lockedCell.innerHTML = itemData.locked;
|
lockedCell.innerHTML = itemData.locked ? LOCKED_GLYPH : null;
|
||||||
let visibleCell = elRow.childNodes[COLUMN_INDEX.VISIBLE];
|
let visibleCell = elRow.childNodes[COLUMN_INDEX.VISIBLE];
|
||||||
visibleCell.innerHTML = itemData.visible;
|
visibleCell.innerHTML = itemData.visible ? VISIBLE_GLYPH : null;
|
||||||
let verticesCountCell = elRow.childNodes[COLUMN_INDEX.VERTICLES_COUNT];
|
let verticesCountCell = elRow.childNodes[COLUMN_INDEX.VERTICLES_COUNT];
|
||||||
verticesCountCell.innerText = itemData.verticesCount;
|
verticesCountCell.innerText = itemData.verticesCount;
|
||||||
let texturesCountCell = elRow.childNodes[COLUMN_INDEX.TEXTURES_COUNT];
|
let texturesCountCell = elRow.childNodes[COLUMN_INDEX.TEXTURES_COUNT];
|
||||||
|
@ -527,13 +528,13 @@ function loaded() {
|
||||||
let texturesSizeCell = elRow.childNodes[COLUMN_INDEX.TEXTURES_SIZE];
|
let texturesSizeCell = elRow.childNodes[COLUMN_INDEX.TEXTURES_SIZE];
|
||||||
texturesSizeCell.innerText = itemData.texturesSize;
|
texturesSizeCell.innerText = itemData.texturesSize;
|
||||||
let hasTransparentCell = elRow.childNodes[COLUMN_INDEX.HAS_TRANSPARENT];
|
let hasTransparentCell = elRow.childNodes[COLUMN_INDEX.HAS_TRANSPARENT];
|
||||||
hasTransparentCell.innerHTML = itemData.hasTransparent;
|
hasTransparentCell.innerHTML = itemData.hasTransparent ? TRANSPARENCY_GLYPH : null;
|
||||||
let isBakedCell = elRow.childNodes[COLUMN_INDEX.IS_BAKED];
|
let isBakedCell = elRow.childNodes[COLUMN_INDEX.IS_BAKED];
|
||||||
isBakedCell.innerHTML = itemData.isBaked;
|
isBakedCell.innerHTML = itemData.isBaked ? BAKED_GLYPH : null;
|
||||||
let drawCallsCell = elRow.childNodes[COLUMN_INDEX.DRAW_CALLS];
|
let drawCallsCell = elRow.childNodes[COLUMN_INDEX.DRAW_CALLS];
|
||||||
drawCallsCell.innerText = itemData.drawCalls;
|
drawCallsCell.innerText = itemData.drawCalls;
|
||||||
let hasScriptCell = elRow.childNodes[COLUMN_INDEX.HAS_SCRIPT];
|
let hasScriptCell = elRow.childNodes[COLUMN_INDEX.HAS_SCRIPT];
|
||||||
hasScriptCell.innerText = itemData.hasScript;
|
hasScriptCell.innerHTML = itemData.hasScript ? SCRIPT_GLYPH : null;
|
||||||
|
|
||||||
// if this entity was previously selected flag it's row as selected
|
// if this entity was previously selected flag it's row as selected
|
||||||
if (itemData.selected) {
|
if (itemData.selected) {
|
||||||
|
@ -579,40 +580,6 @@ function loaded() {
|
||||||
elRow.className = '';
|
elRow.className = '';
|
||||||
elRow.dataset.entityID = EMPTY_ENTITY_ID;
|
elRow.dataset.entityID = EMPTY_ENTITY_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
function resize() {
|
|
||||||
let SCROLLABAR_WIDTH = 21;
|
|
||||||
let tds = document.querySelectorAll("#entity-table-body tr:first-child td");
|
|
||||||
let ths = document.querySelectorAll("#entity-table thead th");
|
|
||||||
if (tds.length >= ths.length) {
|
|
||||||
// Update the widths of the header cells to match the body
|
|
||||||
for (let i = 0; i < ths.length; i++) {
|
|
||||||
ths[i].width = tds[i].offsetWidth;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Reasonable widths if nothing is displayed
|
|
||||||
let tableWidth = document.getElementById("entity-table").offsetWidth - SCROLLABAR_WIDTH;
|
|
||||||
if (showExtraInfo) {
|
|
||||||
ths[0].width = 0.10 * tableWidth;
|
|
||||||
ths[1].width = 0.20 * tableWidth;
|
|
||||||
ths[2].width = 0.20 * tableWidth;
|
|
||||||
ths[3].width = 0.04 * tableWidth;
|
|
||||||
ths[4].width = 0.04 * tableWidth;
|
|
||||||
ths[5].width = 0.08 * tableWidth;
|
|
||||||
ths[6].width = 0.08 * tableWidth;
|
|
||||||
ths[7].width = 0.10 * tableWidth;
|
|
||||||
ths[8].width = 0.04 * tableWidth;
|
|
||||||
ths[9].width = 0.08 * tableWidth;
|
|
||||||
ths[10].width = 0.04 * tableWidth + SCROLLABAR_WIDTH;
|
|
||||||
} else {
|
|
||||||
ths[0].width = 0.16 * tableWidth;
|
|
||||||
ths[1].width = 0.34 * tableWidth;
|
|
||||||
ths[2].width = 0.34 * tableWidth;
|
|
||||||
ths[3].width = 0.08 * tableWidth;
|
|
||||||
ths[4].width = 0.08 * tableWidth;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function toggleFilterInView() {
|
function toggleFilterInView() {
|
||||||
isFilterInView = !isFilterInView;
|
isFilterInView = !isFilterInView;
|
||||||
|
|
|
@ -13,11 +13,11 @@ debugPrint = function (message) {
|
||||||
console.log(message);
|
console.log(message);
|
||||||
};
|
};
|
||||||
|
|
||||||
function ListView(tableId, tableBodyId, tableScrollId, createRowFunction, updateRowFunction,
|
function ListView(elTableHeaderRow, elTableBody, elTableScroll, createRowFunction,
|
||||||
clearRowFunction, resizeFunction, WINDOW_NONVARIABLE_HEIGHT) {
|
updateRowFunction, clearRowFunction, WINDOW_NONVARIABLE_HEIGHT) {
|
||||||
this.elTable = document.getElementById(tableId);
|
this.elTableHeaderRow = elTableHeaderRow;
|
||||||
this.elTableBody = document.getElementById(tableBodyId);
|
this.elTableBody = elTableBody;
|
||||||
this.elTableScroll = document.getElementById(tableScrollId);
|
this.elTableScroll = elTableScroll;
|
||||||
|
|
||||||
this.elTopBuffer = null;
|
this.elTopBuffer = null;
|
||||||
this.elBottomBuffer = null;
|
this.elBottomBuffer = null;
|
||||||
|
@ -25,7 +25,6 @@ function ListView(tableId, tableBodyId, tableScrollId, createRowFunction, update
|
||||||
this.createRowFunction = createRowFunction;
|
this.createRowFunction = createRowFunction;
|
||||||
this.updateRowFunction = updateRowFunction;
|
this.updateRowFunction = updateRowFunction;
|
||||||
this.clearRowFunction = clearRowFunction;
|
this.clearRowFunction = clearRowFunction;
|
||||||
this.resizeFunction = resizeFunction;
|
|
||||||
|
|
||||||
// the list of row elements created in the table up to max viewable height plus SCROLL_ROWS rows for scrolling buffer
|
// the list of row elements created in the table up to max viewable height plus SCROLL_ROWS rows for scrolling buffer
|
||||||
this.elRows = [];
|
this.elRows = [];
|
||||||
|
@ -247,7 +246,7 @@ ListView.prototype = {
|
||||||
|
|
||||||
// create new row elements inserted between the top and bottom buffers up until the max viewable scroll area
|
// create new row elements inserted between the top and bottom buffers up until the max viewable scroll area
|
||||||
let usedHeight = 0;
|
let usedHeight = 0;
|
||||||
while(usedHeight < viewableHeight) {
|
while (usedHeight < viewableHeight) {
|
||||||
let newRow = this.createRowFunction();
|
let newRow = this.createRowFunction();
|
||||||
this.elTableBody.insertBefore(newRow, this.elBottomBuffer);
|
this.elTableBody.insertBefore(newRow, this.elBottomBuffer);
|
||||||
this.rowHeight = newRow.offsetHeight;
|
this.rowHeight = newRow.offsetHeight;
|
||||||
|
@ -262,7 +261,17 @@ ListView.prototype = {
|
||||||
this.elRows.push(scrollRow);
|
this.elRows.push(scrollRow);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.resizeFunction();
|
let ths = this.elTableHeaderRow;
|
||||||
|
let tds = this.getNumRows() > 0 ? this.elRows[0].childNodes : [];
|
||||||
|
if (!ths) {
|
||||||
|
debugPrint("ListView.resize - no valid header row");
|
||||||
|
} else if (tds.length !== ths.length) {
|
||||||
|
debugPrint("ListView.resize - td list size " + tds.length + " does not match th list size " + ths.length);
|
||||||
|
}
|
||||||
|
// update the widths of the header cells to match the body cells (using first row)
|
||||||
|
for (let i = 0; i < ths.length; i++) {
|
||||||
|
ths[i].width = tds[i].offsetWidth;
|
||||||
|
}
|
||||||
|
|
||||||
// restore the scroll point to the same scroll point from before above changes
|
// restore the scroll point to the same scroll point from before above changes
|
||||||
this.elTableScroll.scrollTop = prevScrollTop;
|
this.elTableScroll.scrollTop = prevScrollTop;
|
||||||
|
|
Loading…
Reference in a new issue