aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/collections
diff options
context:
space:
mode:
authorBob Zeleznik <zzzman@gmail.com>2019-05-18 09:42:43 -0400
committerBob Zeleznik <zzzman@gmail.com>2019-05-18 09:42:43 -0400
commit718269e2fa50e20227bfbb32b1a1b6ec8f78184d (patch)
treee5962ada2fca04d21527fff58040517da364d723 /src/client/views/collections
parenta3fab7b55372dd031a19af0ae583cf6f100c0854 (diff)
fixed font error message. Improved opening summaries as either inTab or inPlace and switching with the alt-key
Diffstat (limited to 'src/client/views/collections')
-rw-r--r--src/client/views/collections/CollectionDockingView.tsx7
-rw-r--r--src/client/views/collections/collectionFreeForm/MarqueeView.tsx4
2 files changed, 7 insertions, 4 deletions
diff --git a/src/client/views/collections/CollectionDockingView.tsx b/src/client/views/collections/CollectionDockingView.tsx
index 28624e020..74f8ad242 100644
--- a/src/client/views/collections/CollectionDockingView.tsx
+++ b/src/client/views/collections/CollectionDockingView.tsx
@@ -432,8 +432,11 @@ export class DockedFrameRenderer extends React.Component<DockedFrameProps> {
}
get previewPanelCenteringOffset() { return (this._panelWidth - this.nativeWidth() * this.contentScaling()) / 2; }
- addDocTab = (doc: Doc) => {
- CollectionDockingView.Instance.AddTab(this._stack, doc);
+ addDocTab = (doc: Doc, location: string) => {
+ if (location === "onRight")
+ CollectionDockingView.Instance.AddRightSplit(doc);
+ else
+ CollectionDockingView.Instance.AddTab(this._stack, doc);
}
get content() {
if (!this._document) {
diff --git a/src/client/views/collections/collectionFreeForm/MarqueeView.tsx b/src/client/views/collections/collectionFreeForm/MarqueeView.tsx
index c3c4115b8..6301fd27e 100644
--- a/src/client/views/collections/collectionFreeForm/MarqueeView.tsx
+++ b/src/client/views/collections/collectionFreeForm/MarqueeView.tsx
@@ -272,9 +272,9 @@ export class MarqueeView extends React.Component<MarqueeViewProps>
newCollection.proto!.summaryDoc = summary;
selected = [newCollection];
newCollection.x = bounds.left + bounds.width;
- this.props.addDocument(newCollection, false);
+ //this.props.addDocument(newCollection, false);
summary.proto!.summarizedDocs = new List<Doc>(selected.map(s => s.proto!));
- //summary.proto!.maximizeOnRight = true;
+ summary.proto!.maximizeLocation = "inTab"; // or "inPlace", or "onRight"
//summary.proto!.isButton = true;
//let scrpt = this.props.getTransform().inverse().transformPoint(bounds.left, bounds.top);
// selected.map(summarizedDoc => {