diff options
| author | bobzel <zzzman@gmail.com> | 2021-01-22 21:14:37 -0500 |
|---|---|---|
| committer | bobzel <zzzman@gmail.com> | 2021-01-22 21:14:37 -0500 |
| commit | d0025200b23f57ec25d3452d425de8725a032c6a (patch) | |
| tree | 843ef1f021239af4b7f82c9eee553a9978fe0f46 /src/client/views/collections/collectionFreeForm | |
| parent | b9326dfc3e15683190a7d520daca6791ef049dea (diff) | |
fixed selection bounds for video box annotations, especially when in full screen view.
Diffstat (limited to 'src/client/views/collections/collectionFreeForm')
| -rw-r--r-- | src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx index bc86ecd19..013472a04 100644 --- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx +++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx @@ -137,11 +137,11 @@ export class CollectionFreeFormView extends CollectionSubView<PanZoomDocument, P } @computed get cachedCenteringShiftX(): number { const scaling = this.fitToContent || !this.contentScaling ? 1 : this.contentScaling; - return !this.props.isAnnotationOverlay ? this.props.PanelWidth() / 2 / this.parentScaling / scaling : 0; // shift so pan position is at center of window for non-overlay collections + return this.props.isAnnotationOverlay ? 0 : this.props.PanelWidth() / 2 / this.parentScaling / scaling; // shift so pan position is at center of window for non-overlay collections } @computed get cachedCenteringShiftY(): number { const scaling = this.fitToContent || !this.contentScaling ? 1 : this.contentScaling; - return !this.props.isAnnotationOverlay ? this.props.PanelHeight() / 2 / this.parentScaling / scaling : 0;// shift so pan position is at center of window for non-overlay collections + return this.props.isAnnotationOverlay ? 0 : this.props.PanelHeight() / 2 / this.parentScaling / scaling;// shift so pan position is at center of window for non-overlay collections } @computed get cachedGetLocalTransform(): Transform { return Transform.Identity().scale(1 / this.zoomScaling()).translate(this.panX(), this.panY()); @@ -200,7 +200,7 @@ export class CollectionFreeFormView extends CollectionSubView<PanZoomDocument, P const dispTime = NumCast(doc.displayTimecode, -1); const endTime = NumCast(doc.undisplayTimecode, dispTime + 1.5); const curTime = NumCast(this.Document._currentTimecode, -1); - return dispTime === -1 || (curTime > dispTime && curTime < endTime); + return dispTime === -1 || ((curTime - dispTime) >= -0.1 && curTime <= endTime); } public getActiveDocuments = () => { |
