diff options
author | Vijay Aravamudhan <vraravam@users.noreply.github.com> | 2022-06-24 07:36:57 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-24 02:06:57 +0000 |
commit | 2810c71f17774723121abcba143a4cccec1730d6 (patch) | |
tree | 2ab7ad423d1736cda313017e27d7b5fcf46bb552 /src | |
parent | Change login screen layout (#345) (diff) | |
download | ferdium-app-2810c71f17774723121abcba143a4cccec1730d6.tar.gz ferdium-app-2810c71f17774723121abcba143a4cccec1730d6.tar.zst ferdium-app-2810c71f17774723121abcba143a4cccec1730d6.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/components/layout/AppLayout.js | 9 | ||||
-rw-r--r-- | src/index.html | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index 5cfd66714..b2f1c9923 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
@@ -124,12 +124,16 @@ class AppLayout extends Component { | |||
124 | 124 | ||
125 | const { intl } = this.props; | 125 | const { intl } = this.props; |
126 | 126 | ||
127 | const { locked, automaticUpdates } = settings.app; | 127 | const { locked, automaticUpdates, showDragArea } = settings.app; |
128 | if (locked) { | 128 | if (locked) { |
129 | return <LockedScreen />; | 129 | return <LockedScreen />; |
130 | } | 130 | } |
131 | 131 | ||
132 | return ( | 132 | return ( |
133 | <> | ||
134 | {isMac && !isFullScreen && showDragArea && ( | ||
135 | <div className="window-draggable" /> | ||
136 | )} | ||
133 | <ErrorBoundary> | 137 | <ErrorBoundary> |
134 | <div className="app"> | 138 | <div className="app"> |
135 | {isWindows && !isFullScreen && ( | 139 | {isWindows && !isFullScreen && ( |
@@ -138,7 +142,7 @@ class AppLayout extends Component { | |||
138 | icon="assets/images/logo.svg" | 142 | icon="assets/images/logo.svg" |
139 | /> | 143 | /> |
140 | )} | 144 | )} |
141 | {isMac && !isFullScreen && ( | 145 | {isMac && !isFullScreen && showDragArea && ( |
142 | <span | 146 | <span |
143 | onDoubleClick={toggleFullScreen} | 147 | onDoubleClick={toggleFullScreen} |
144 | className={classes.titleBar} | 148 | className={classes.titleBar} |
@@ -207,6 +211,7 @@ class AppLayout extends Component { | |||
207 | </div> | 211 | </div> |
208 | </div> | 212 | </div> |
209 | </ErrorBoundary> | 213 | </ErrorBoundary> |
214 | </> | ||
210 | ); | 215 | ); |
211 | } | 216 | } |
212 | } | 217 | } |
diff --git a/src/index.html b/src/index.html index eb42a1e8d..e50ec8777 100644 --- a/src/index.html +++ b/src/index.html | |||
@@ -14,7 +14,6 @@ | |||
14 | <script type="text/javascript" src="./app.js"></script> | 14 | <script type="text/javascript" src="./app.js"></script> |
15 | </head> | 15 | </head> |
16 | <body> | 16 | <body> |
17 | <div class="window-draggable"></div> | ||
18 | <div class="dev-warning">DEV MODE</div> | 17 | <div class="dev-warning">DEV MODE</div> |
19 | <div id="root"></div> | 18 | <div id="root"></div> |
20 | <div id="portalContainer"></div> | 19 | <div id="portalContainer"></div> |