diff options
author | yunahi <60233430+yunahi@users.noreply.github.com> | 2020-07-03 20:22:52 +0900 |
---|---|---|
committer | yunahi <60233430+yunahi@users.noreply.github.com> | 2020-07-03 20:22:52 +0900 |
commit | 7c93a65535a278dd1381b27fbd4c3869eed19527 (patch) | |
tree | 24b96968ebfb4233dfeab63708e31c353099559b /src/client/views/MainView.tsx | |
parent | 4a3cc60a32ad5dcd86fbfad1721e91beb9769c0d (diff) |
pin and icon
Diffstat (limited to 'src/client/views/MainView.tsx')
-rw-r--r-- | src/client/views/MainView.tsx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx index 8f5a31b6c..afdff4ed8 100644 --- a/src/client/views/MainView.tsx +++ b/src/client/views/MainView.tsx @@ -453,10 +453,12 @@ export class MainView extends React.Component { @computed get mainContent() { const sidebar = this.userDoc?.["tabs-panelContainer"]; + console.log(InkOptionsMenu.Instance?.Pinned); return !this.userDoc || !(sidebar instanceof Doc) ? (null) : ( <div className="mainView-mainContent" style={{ color: this.darkScheme ? "rgb(205,205,205)" : "black", - height: RichTextMenu.Instance?.Pinned ? `calc(100% - ${ANTIMODEMENU_HEIGHT})` : "100%" + height: (RichTextMenu.Instance?.Pinned || InkOptionsMenu.Instance?.Pinned) ? `calc(100% - ${ANTIMODEMENU_HEIGHT})` : "100%" + }} > <div style={{ display: "contents", flexDirection: "row", position: "relative" }}> <div className="mainView-flyoutContainer" onPointerLeave={this.pointerLeaveDragger} style={{ width: this.flyoutWidth }}> @@ -593,7 +595,10 @@ export class MainView extends React.Component { <SettingsManager /> <GoogleAuthenticationManager /> <DocumentDecorations /> - <GestureOverlay> + <InkOptionsMenu /> + + <GestureOverlay > + <RichTextMenu key="rich" /> {this.mainContent} </GestureOverlay> @@ -606,7 +611,7 @@ export class MainView extends React.Component { <RadialMenu /> <PDFMenu /> <MarqueeOptionsMenu /> - <InkOptionsMenu /> + <OverlayView /> <TimelineMenu /> {this.snapLines} |