aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbobzel <zzzman@gmail.com>2023-09-28 00:27:01 -0400
committerbobzel <zzzman@gmail.com>2023-09-28 00:27:01 -0400
commit35fbb1809fab2600e3fd948d8bbcd0c29417680a (patch)
tree4263827bd6b7105a90e812212879cd1ff41ae475 /src
parent78edc744c77e378728d033001331737df0b2f393 (diff)
fixed images in schema to have a width. removed maximise functionality from goldenlayout.
Diffstat (limited to 'src')
-rw-r--r--src/client/goldenLayout.js1
-rw-r--r--src/client/views/collections/collectionSchema/SchemaTableCell.tsx2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/client/goldenLayout.js b/src/client/goldenLayout.js
index 00ec5e439..588bf57d1 100644
--- a/src/client/goldenLayout.js
+++ b/src/client/goldenLayout.js
@@ -3377,6 +3377,7 @@
if (this.isMaximised === true) {
this.layoutManager._$minimiseItem(this);
} else {
+ return;
this.layoutManager._$maximiseItem(this);
}
diff --git a/src/client/views/collections/collectionSchema/SchemaTableCell.tsx b/src/client/views/collections/collectionSchema/SchemaTableCell.tsx
index e18f27fb0..4092d9722 100644
--- a/src/client/views/collections/collectionSchema/SchemaTableCell.tsx
+++ b/src/client/views/collections/collectionSchema/SchemaTableCell.tsx
@@ -232,7 +232,7 @@ export class SchemaImageCell extends React.Component<SchemaTableCellProps> {
const height = this.props.rowHeight() ? this.props.rowHeight() - (this.props.padding || 6) * 2 : undefined;
const width = height ? height * aspect : undefined; // increase the width of the image if necessary to maintain proportionality
- return <img src={this.url} width={width} height={height} style={{}} draggable="false" onPointerEnter={this.showHoverPreview} onPointerMove={this.moveHoverPreview} onPointerLeave={this.removeHoverPreview} />;
+ return <img src={this.url} width={width ? width : undefined} height={height} style={{}} draggable="false" onPointerEnter={this.showHoverPreview} onPointerMove={this.moveHoverPreview} onPointerLeave={this.removeHoverPreview} />;
}
}