From bc10522753aace25137755c45003bb8eef835a85 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 5 Aug 2021 15:16:25 +0200
Subject: [PATCH] OZG-961 fix darkmode toggle for keyboard

---
 .../header/settings/settings.component.html              | 9 +++++++--
 .../header/settings/settings.component.scss              | 4 ++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/goofy-client/libs/navigation/src/lib/header-container/header/settings/settings.component.html b/goofy-client/libs/navigation/src/lib/header-container/header/settings/settings.component.html
index b4e29e9159..1524dc46ed 100644
--- a/goofy-client/libs/navigation/src/lib/header-container/header/settings/settings.component.html
+++ b/goofy-client/libs/navigation/src/lib/header-container/header/settings/settings.component.html
@@ -1,9 +1,14 @@
-<goofy-client-icon-button-with-spinner icon="settings" [matMenuTriggerFor]="settingsMenu"></goofy-client-icon-button-with-spinner>
+<goofy-client-icon-button-with-spinner
+		icon="settings"
+		[matMenuTriggerFor]="settingsMenu"
+		(menuOpened)="toggle.focus()">
+</goofy-client-icon-button-with-spinner>
+
 <mat-menu #settingsMenu="matMenu" >
 	<div class="menu-container"
 		(click)="$event.stopPropagation()">
 
-		<mat-slide-toggle color="primary"
+		<mat-slide-toggle color="primary" #toggle
 			[checked]="darkMode"
 			(change)="darkModeEmitter.emit($event.checked)">Dark Mode
 		</mat-slide-toggle>
diff --git a/goofy-client/libs/navigation/src/lib/header-container/header/settings/settings.component.scss b/goofy-client/libs/navigation/src/lib/header-container/header/settings/settings.component.scss
index abfd190361..982d28ee45 100644
--- a/goofy-client/libs/navigation/src/lib/header-container/header/settings/settings.component.scss
+++ b/goofy-client/libs/navigation/src/lib/header-container/header/settings/settings.component.scss
@@ -1,3 +1,7 @@
 .menu-container {
 	margin: 12px 16px;
 }
+
+goofy-client-icon-button-with-spinner {
+	display: block;
+}
-- 
GitLab