aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBob Zeleznik <zzzman@gmail.com>2019-04-17 21:33:11 -0400
committerBob Zeleznik <zzzman@gmail.com>2019-04-17 21:33:11 -0400
commitba20c5a0fe5f74bfc59b0d6d46cb5731585515d2 (patch)
tree63b411353164fdfd2f1974bd60d63ae32c3898a9 /src
parent6c56cbad38efbde578e2c2c90cbce4b7ff033059 (diff)
fixed docking view for documents with native widths
Diffstat (limited to 'src')
-rw-r--r--src/client/views/collections/CollectionDockingView.scss5
-rw-r--r--src/client/views/collections/CollectionDockingView.tsx13
2 files changed, 6 insertions, 12 deletions
diff --git a/src/client/views/collections/CollectionDockingView.scss b/src/client/views/collections/CollectionDockingView.scss
index 50da2b11d..b4d9efc47 100644
--- a/src/client/views/collections/CollectionDockingView.scss
+++ b/src/client/views/collections/CollectionDockingView.scss
@@ -3,11 +3,6 @@
.collectiondockingview-content {
height: 100%;
text-align:center;
- .documentView-node-topmost {
- text-align:left;
- transform-origin: center top;
- display: inline-block;
- }
}
.collectiondockingview-content-height {
height: 100%;
diff --git a/src/client/views/collections/CollectionDockingView.tsx b/src/client/views/collections/CollectionDockingView.tsx
index 9ec0b3aeb..62321b7a8 100644
--- a/src/client/views/collections/CollectionDockingView.tsx
+++ b/src/client/views/collections/CollectionDockingView.tsx
@@ -337,13 +337,11 @@ export class DockedFrameRenderer extends React.Component<DockedFrameProps> {
ScreenToLocalTransform = () => {
let { scale, translateX, translateY } = Utils.GetScreenTransform(this._mainCont.current!.children[0].firstChild as HTMLElement);
- let scaling = scale;
- {
- let { scale, translateX, translateY } = Utils.GetScreenTransform(this._mainCont.current!);
- scaling = scale;
- }
- return CollectionDockingView.Instance.props.ScreenToLocalTransform().translate(-translateX, -translateY).scale(scaling / this._contentScaling());
+ scale = Utils.GetScreenTransform(this._mainCont.current!).scale;
+ return CollectionDockingView.Instance.props.ScreenToLocalTransform().translate(-translateX, -translateY).scale(scale / this._contentScaling());
}
+ get previewPanelCenteringOffset() { return (this._panelWidth - this._nativeWidth() * this._contentScaling()) / 2; }
+
render() {
if (!this._document) {
@@ -352,7 +350,8 @@ export class DockedFrameRenderer extends React.Component<DockedFrameProps> {
let wscale = this._panelWidth / (this._nativeWidth() ? this._nativeWidth() : this._panelWidth);
let name = (wscale * this._nativeHeight() > this._panelHeight) ? "" : "-height";
var content =
- <div className={`collectionDockingView-content${name}`} ref={this._mainCont}>
+ <div className={`collectionDockingView-content${name}`} ref={this._mainCont}
+ style={{ transform: `translate(${this.previewPanelCenteringOffset}px, 0px)` }}>
<DocumentView key={this._document.Id} Document={this._document}
addDocument={undefined}
removeDocument={undefined}