OPTION 3

Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
nextcloud · Apr 18, 2024 · 9815e94 · 9815e94
1 parent 39f1075
commit 9815e94
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/src/talk/renderer/DesktopHeader.vue b/src/talk/renderer/DesktopHeader.vue
@@ -88,10 +88,10 @@ export default {
 
 <style>
 :root {
-	--talk-desktop-menu: 54px;
+	--talk-desktop-menu: calc(100vw - (env(titlebar-area-width, 100vw) - 54px));
 }
 
-.top-bar {
+body:has(.app-sidebar[style='display: none;']) .top-bar {
 	padding-right: var(--talk-desktop-menu) !important;
 }
 
@@ -112,7 +112,7 @@ export default {
 	color: #FFF;
 	position: absolute;
 	top: 0;
-	right: 0;
+	right: calc(100vw - env(titlebar-area-width, 100vw));
 	z-index: 1000;
 }
 
@@ -123,7 +123,6 @@ export default {
 	height: 100%;
 	/* Save space for native title bar buttons */
 	margin-inline-start: env(titlebar-area-x, 0);
-	width: env(titlebar-area-width, 100%);
 }
 
 .header__item {
@@ -157,6 +156,6 @@ export default {
 	flex: 1 0 auto;
 	height: 100%;
 	/* Allow to drag the window using header */
-	app-region: drag;
+	/*app-region: drag;*/
 }
 </style>
diff --git a/src/talk/talk.window.js b/src/talk/talk.window.js
@@ -40,12 +40,12 @@ function createTalkWindow() {
 			preload: TALK_WINDOW_PRELOAD_WEBPACK_ENTRY,
 		},
 		icon: getBrowserWindowIcon(),
-		// titleBarStyle: 'hidden',
-		// titleBarOverlay: {
-		// 	color: '#00669E00', // Transparent
-		// 	symbolColor: '#FFFFFF', // White
-		// 	height: 50,
-		// },
+		titleBarStyle: 'hidden',
+		titleBarOverlay: {
+			color: '#00669E00', // Transparent
+			symbolColor: '#FFFFFF', // White
+			height: 60,
+		},
 		// Position of the top left corner of the traffic light on Mac
 		trafficLightPosition: {
 			x: 12, // In line with SearchBox