diff options
author | bobzel <zzzman@gmail.com> | 2022-05-24 13:10:33 -0400 |
---|---|---|
committer | bobzel <zzzman@gmail.com> | 2022-05-24 13:10:33 -0400 |
commit | 097998abda6857a498f6cfc8a7214a18b09b8451 (patch) | |
tree | 173e74b644c0ceebc4455910517f2bb7df21cff5 /src/client/views/MainView.tsx | |
parent | dd583ba1728d2b941cd253f68636a43b5b6c1930 (diff) |
fixed TabDocView's screenToLocal xf when headerBar opens/closes. changed webBox to update thumbnails when native dims change. cleaned up content dragging/activation for multiRow/col for headerBar
Diffstat (limited to 'src/client/views/MainView.tsx')
-rw-r--r-- | src/client/views/MainView.tsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx index 4b7b9fc23..183efc944 100644 --- a/src/client/views/MainView.tsx +++ b/src/client/views/MainView.tsx @@ -283,7 +283,6 @@ export class MainView extends React.Component { } headerBarScreenXf = () => new Transform(-this.leftScreenOffsetOfMainDocView - this.leftMenuFlyoutWidth(), -this.headerBarDocHeight(), 1); - headerContentActive = () => SnappingManager.GetIsDragging() && DocListCast(CurrentUserUtils.MyHeaderBarDoc.data).length ? false : true; @computed get headerBarDocView() { return <div style={{ height: this.headerBarDocHeight() }}> <DocumentView key="headerBarDoc" @@ -297,7 +296,8 @@ export class MainView extends React.Component { rootSelected={returnTrue} removeDocument={returnFalse} fitContentsToDoc={returnTrue} - isContentActive={this.headerContentActive} + isDocumentActive={returnTrue} // headerBar is always documentActive (ie, the docView gets pointer events) + isContentActive={returnTrue} // headerBar is awlays contentActive which means its items are always documentActive ScreenToLocalTransform={this.headerBarScreenXf} childHideResizeHandles={returnTrue} hideResizeHandles={true} |