diff options
author | geireann <geireann.lindfield@gmail.com> | 2023-08-24 12:02:31 -0400 |
---|---|---|
committer | geireann <geireann.lindfield@gmail.com> | 2023-08-24 12:02:31 -0400 |
commit | f2101ee3d60baa8a3ca4fd7fee7dc96ed2ed6645 (patch) | |
tree | 5d04356c113c058690b23d9bf65b24c8508ff7e6 /src/client/views/MainView.tsx | |
parent | 522e8d499d7652848396bcd6e34600ae7d795c66 (diff) | |
parent | 50d65b4e805fd779400c710551648541b12ba3e6 (diff) |
Merge branch 'master' into sophie-ai-images
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 559a8e8d5..a785ffd42 100644 --- a/src/client/views/MainView.tsx +++ b/src/client/views/MainView.tsx @@ -1011,15 +1011,15 @@ export class MainView extends React.Component { <AnchorMenu /> <DashFieldViewMenu /> <MarqueeOptionsMenu /> - <OverlayView /> <TimelineMenu /> <RichTextMenu /> <InkTranscription /> {this.snapLines} <LightboxView key="lightbox" PanelWidth={this._windowWidth} PanelHeight={this._windowHeight} maxBorder={[200, 50]} /> + <OverlayView /> <GPTPopup key="gptpopup" /> <GenerativeFill imageEditorOpen={ImageBox.imageEditorOpen} imageEditorSource={ImageBox.imageEditorSource} imageRootDoc={ImageBox.imageRootDoc} addDoc={ImageBox.addDoc} /> - {/* <NewLightboxView key="newLightbox" PanelWidth={this._windowWidth} PanelHeight={this._windowHeight} maxBorder={[200, 50]} /> */} + {/* <NewLightboxView key="newLightbox" PanelWidth={this._windowWidth} PanelHeight={this._windowHeight} maxBorder={[200, 50]} /> */} </div> ); } |