From aac2c494691fae6aa0967a072bf2b2c3b091b9ec Mon Sep 17 00:00:00 2001 From: dank074 Date: Sat, 4 Dec 2021 19:12:26 -0600 Subject: [PATCH 1/2] fixes --- src/layout/card/header/NitroCardHeaderView.scss | 5 ----- src/views/chat-history/ChatHistoryView.scss | 9 +++++++++ .../RelationshipsContainerView.tsx | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/layout/card/header/NitroCardHeaderView.scss b/src/layout/card/header/NitroCardHeaderView.scss index ded3c2bd..fe6c9d8e 100644 --- a/src/layout/card/header/NitroCardHeaderView.scss +++ b/src/layout/card/header/NitroCardHeaderView.scss @@ -16,11 +16,6 @@ } } - &.theme-dark { - background-color: #3d5f6e !important; - color: #fff; - } - .bg-tertiary-split { position: relative; border-bottom: 2px solid darken($quaternary, 5); diff --git a/src/views/chat-history/ChatHistoryView.scss b/src/views/chat-history/ChatHistoryView.scss index 9f8e6385..84bafc9f 100644 --- a/src/views/chat-history/ChatHistoryView.scss +++ b/src/views/chat-history/ChatHistoryView.scss @@ -2,6 +2,15 @@ width: $chat-history-width; height: $chat-history-height; + background-color: #1C323F; + border: 2px solid rgba(255, 255, 255, 0.5); + border-radius: 0.25rem; + + .nitro-card-header-container { + background-color: #3d5f6e; + color: #fff; + } + .chat-history-content { .chat-history-container { min-height: 200px; diff --git a/src/views/user-profile/views/relationships-container/RelationshipsContainerView.tsx b/src/views/user-profile/views/relationships-container/RelationshipsContainerView.tsx index e1bb648c..4f1745cb 100644 --- a/src/views/user-profile/views/relationships-container/RelationshipsContainerView.tsx +++ b/src/views/user-profile/views/relationships-container/RelationshipsContainerView.tsx @@ -25,7 +25,7 @@ export const RelationshipsContainerView: FC = p return (
- +
OnUserClick(relationshipInfo)}> From a33f06ad27dc43a6ae36694d7130cd6509881d19 Mon Sep 17 00:00:00 2001 From: dank074 Date: Sat, 4 Dec 2021 22:42:48 -0600 Subject: [PATCH 2/2] fix click detection --- .../floorplan-editor/FloorplanEditorView.scss | 2 +- .../common/FloorplanEditor.ts | 29 +++++++++---------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/views/floorplan-editor/FloorplanEditorView.scss b/src/views/floorplan-editor/FloorplanEditorView.scss index b11b5107..7bc41e59 100644 --- a/src/views/floorplan-editor/FloorplanEditorView.scss +++ b/src/views/floorplan-editor/FloorplanEditorView.scss @@ -6,7 +6,7 @@ width: 100%; height: 300px; min-height: 300px; - overflow-x: scroll; + overflow: scroll; } .color { diff --git a/src/views/floorplan-editor/common/FloorplanEditor.ts b/src/views/floorplan-editor/common/FloorplanEditor.ts index 99cdd12c..71fcbed9 100644 --- a/src/views/floorplan-editor/common/FloorplanEditor.ts +++ b/src/views/floorplan-editor/common/FloorplanEditor.ts @@ -43,7 +43,7 @@ export class FloorplanEditor extends PixiApplicationProxy this._width = 0; this._height = 0; this._isHolding = false; - this._lastUsedTile = new NitroPoint(-1,-1); + this._lastUsedTile = new NitroPoint(-1, -1); this._actionSettings = new ActionSettings(); } @@ -52,7 +52,7 @@ export class FloorplanEditor extends PixiApplicationProxy if(!this._isInitialized) { this.loader.add('tiles', GetConfiguration('floorplan.tile.url')); - + this.loader.load((_, resources) => { this._tilemapRenderer = new NitroTilemap(resources['tiles'].spritesheet.baseTexture); @@ -127,9 +127,8 @@ export class FloorplanEditor extends PixiApplicationProxy const bufIndex = j + bufSize; const data = buffer.slice(j, bufIndex); - const width = data[4]; - const height = data[5]; - + const width = TILE_SIZE; + const height = TILE_SIZE / 2; const mousePositionX = Math.floor(tempPoint.x); const mousePositionY = Math.floor(tempPoint.y); @@ -137,12 +136,11 @@ export class FloorplanEditor extends PixiApplicationProxy const tileStartX = data[2]; const tileStartY = data[3]; - const centreX = tileStartX + (width / 2); const centreY = tileStartY + (height / 2); - const dx = Math.abs(mousePositionX - centreX - 2); - const dy = Math.abs(mousePositionY - centreY - 2); + const dx = Math.abs(mousePositionX - centreX); + const dy = Math.abs(mousePositionY - centreY); const solution = (dx / (width * 0.5) + dy / (height * 0.5) <= 1);//todo: improve this if(solution) @@ -171,7 +169,6 @@ export class FloorplanEditor extends PixiApplicationProxy return false; } - private onClick(x: number, y: number): void { const tile = this._tilemap[y][x]; @@ -212,7 +209,7 @@ export class FloorplanEditor extends PixiApplicationProxy { if((x + 1) > this._width) this._width = x + 1; - if( (y + 1) > this._height) this._height = y + 1; + if((y + 1) > this._height) this._height = y + 1; } const newHeight = HEIGHT_SCHEME[futureHeightIndex]; @@ -229,7 +226,7 @@ export class FloorplanEditor extends PixiApplicationProxy public renderTiles(): void { this.tilemapRenderer.clear(); - + for(let y = 0; y < this._tilemap.length; y++) { for(let x = 0; x < this.tilemap[y].length; x++) @@ -237,13 +234,13 @@ export class FloorplanEditor extends PixiApplicationProxy const tile = this.tilemap[y][x]; let assetName = tile.height; - if(this._doorLocation.x === x && this._doorLocation.y === y) + if(this._doorLocation.x === x && this._doorLocation.y === y) assetName = FloorplanEditor.TILE_DOOR; if(tile.isBlocked) assetName = FloorplanEditor.TILE_BLOCKED; - + //if((tile.height === 'x') || tile.height === 'X') continue; - const [positionX, positionY ] = getScreenPositionForTile(x, y); + const [positionX, positionY] = getScreenPositionForTile(x, y); this._tilemapRenderer.tile(`${assetName}.png`, positionX, positionY); } } @@ -337,10 +334,10 @@ export class FloorplanEditor extends PixiApplicationProxy if(tile.height !== 'x') { - if( (x + 1) > this._width) + if((x + 1) > this._width) this._width = x + 1; - if( (y + 1) > this._height) + if((y + 1) > this._height) this._height = y + 1; } }