aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMohammad Amoush <mohammad_amoush@brown.edu>2019-07-25 19:03:04 -0400
committerMohammad Amoush <mohammad_amoush@brown.edu>2019-07-25 19:03:04 -0400
commit24a73583847e6ab00c8b1a00859129665e6ac212 (patch)
tree08fe112b684fd3a5d2df47a146019c57b8464406
parentf55dd40423b85efcdfbae1dd037743de9f6f15c4 (diff)
Css Acting weird, fixes needed
-rw-r--r--src/client/views/presentationview/PresentationElement.tsx66
-rw-r--r--src/client/views/presentationview/PresentationView.scss14
2 files changed, 55 insertions, 25 deletions
diff --git a/src/client/views/presentationview/PresentationElement.tsx b/src/client/views/presentationview/PresentationElement.tsx
index 859ab9862..ff68f47ba 100644
--- a/src/client/views/presentationview/PresentationElement.tsx
+++ b/src/client/views/presentationview/PresentationElement.tsx
@@ -798,6 +798,8 @@ export default class PresentationElement extends React.Component<PresentationEle
// {TreeView.GetChildElements([this.props.document], "", new Doc(), undefined, "", (doc: Doc, relativeTo?: Doc, before?: boolean) => false, this.props.removeDocByRef, this.move,
// StrCast(this.props.document.dropAction) as dropActionType, (doc: Doc, dataDoc: Doc | undefined, where: string) => { }, Transform.Identity, () => ({ translateX: 0, translateY: 0 }), () => false, () => 400, 7)}
// </ul >;
+ let propDocWidth = NumCast(this.props.document.nativeWidth);
+ let propDocHeight = NumCast(this.props.document.nativeHeight);
let scale = () => 175 / NumCast(this.props.document.nativeWidth, 175);
return (
// <DocumentView
@@ -817,27 +819,47 @@ export default class PresentationElement extends React.Component<PresentationEle
// zoomToScale={(scale: number) => { }}
// getScale={() => 3.1415}
// />
-
- <DocumentView
- fitToBox={StrCast(this.props.document.type).indexOf(DocumentType.COL) !== -1}
- Document={this.props.document}
- addDocument={returnFalse}
- removeDocument={returnFalse}
- ScreenToLocalTransform={Transform.Identity}
- addDocTab={returnFalse}
- renderDepth={1}
- PanelWidth={() => 175}
- PanelHeight={() => 175}
- focus={emptyFunction}
- selectOnLoad={false}
- parentActive={returnFalse}
- whenActiveChanged={returnFalse}
- bringToFront={emptyFunction}
- zoomToScale={emptyFunction}
- getScale={returnOne}
- ContainingCollectionView={undefined}
- ContentScaling={scale}
- />
+ <div style={{
+ // overflowY: "scroll",
+ position: "relative",
+ // right: "45%",
+ // maxHeight: 250
+ height: propDocHeight === 0 ? "auto" : propDocHeight * scale(),
+ width: propDocWidth === 0 ? "auto" : propDocWidth * scale(),
+ marginTop: 15
+
+ }}>
+ <DocumentView
+ fitToBox={StrCast(this.props.document.type).indexOf(DocumentType.COL) !== -1}
+ Document={this.props.document}
+ addDocument={returnFalse}
+ removeDocument={returnFalse}
+ ScreenToLocalTransform={Transform.Identity}
+ addDocTab={returnFalse}
+ renderDepth={1}
+ PanelWidth={() => 20}
+ PanelHeight={() => 20}
+ focus={emptyFunction}
+ selectOnLoad={false}
+ parentActive={returnFalse}
+ whenActiveChanged={returnFalse}
+ bringToFront={emptyFunction}
+ zoomToScale={emptyFunction}
+ getScale={returnOne}
+ ContainingCollectionView={undefined}
+ ContentScaling={scale}
+ />
+ <div style={{
+ width: " 100%",
+ height: " 100%",
+ position: "absolute",
+ left: 0,
+ top: 0,
+ background: "transparent",
+ zIndex: 2,
+
+ }}></div>
+ </div>
);
}
@@ -863,7 +885,7 @@ export default class PresentationElement extends React.Component<PresentationEle
style={{
outlineColor: "maroon",
outlineStyle: "dashed",
- outlineWidth: BoolCast(p.document.libraryBrush) ? `1px` : "0px"
+ outlineWidth: BoolCast(p.document.libraryBrush) ? `1px` : "0px",
}}
onClick={e => { p.gotoDocument(p.index, NumCast(this.props.mainDocument.selectedDoc)); e.stopPropagation(); }}>
<strong className="presentationView-name">
diff --git a/src/client/views/presentationview/PresentationView.scss b/src/client/views/presentationview/PresentationView.scss
index c2d064941..93cf0b365 100644
--- a/src/client/views/presentationview/PresentationView.scss
+++ b/src/client/views/presentationview/PresentationView.scss
@@ -19,12 +19,20 @@
-ms-user-select: none;
user-select: none;
transition: all .1s;
- max-height: 250px;
+ //max-height: 250px;
.jsx-parser {
- height: 300px;
+ // height: 300px;
//width: 400px;
- margin-top: 20px;
+ // margin-top: 20px;
+ // overflow-y: scroll;
+ }
+
+ .documentView-node {
+ // height: auto !important;
+ // width: aut !important;
+ position: absolute;
+ z-index: 1;
}
}