Various fixes for CCT & Brightness control

src-ui/app/components/brightness-control-modal/brightness-control-modal.component.ts

@@ -1,5 +1,5 @@
 import { Component, DestroyRef, OnInit } from '@angular/core';
-import { fadeUp, vshrink } from '../../utils/animations';
+import { fadeUp, hshrink, vshrink } from '../../utils/animations';
 import { BaseModalComponent } from '../base-modal/base-modal.component';
 import { ModalOptions } from '../../services/modal.service';
 import { HardwareBrightnessControlService } from '../../services/brightness-control/hardware-brightness-control.service';
@@ -14,7 +14,7 @@ import { Router } from '@angular/router';
   selector: 'app-brightness-control-modal',
   templateUrl: './brightness-control-modal.component.html',
   styleUrls: ['./brightness-control-modal.component.scss'],
-  animations: [fadeUp(), vshrink()],
+  animations: [fadeUp(), vshrink(), hshrink()],
 })
 export class BrightnessControlModalComponent
   extends BaseModalComponent<void, void>

src-ui/app/components/bsb-fan-speed-control-modal/bsb-fan-speed-control-modal.component.ts

@@ -1,5 +1,5 @@
 import { Component, DestroyRef, OnInit } from '@angular/core';
-import { fadeUp, vshrink } from '../../utils/animations';
+import { fadeUp, hshrink, vshrink } from '../../utils/animations';
 import { BaseModalComponent } from '../base-modal/base-modal.component';
 import { ModalOptions } from '../../services/modal.service';
 import { AutomationConfigService } from '../../services/automation-config.service';
@@ -12,7 +12,7 @@ import { BigscreenBeyondFanAutomationService } from '../../services/hmd-specific
   selector: 'app-bsb-fan-speed-control-modal',
   templateUrl: './bsb-fan-speed-control-modal.component.html',
   styleUrls: ['./bsb-fan-speed-control-modal.component.scss'],
-  animations: [fadeUp(), vshrink()],
+  animations: [fadeUp(), vshrink(), hshrink()],
 })
 export class BSBFanSpeedControlModalComponent
   extends BaseModalComponent<void, void>

src-ui/app/components/main-status-bar/main-status-bar.component.scss

@@ -1,5 +1,4 @@
 @import 'effects';
-@import '@fontsource/fira-code/index.css';
 
 $decoration-top: 1em;
 $background-color: var(--color-surface-2);

src-ui/app/components/osc-script-modal/osc-script-modal.component.scss

@@ -1,4 +1,3 @@
-@import '@fontsource/fira-code/index.css';
 
 .modal-inner-wrapper {
   margin-top: 16px;

src-ui/app/services/cct-control/cct-control.service.ts

@@ -1,5 +1,11 @@
 import { Injectable } from '@angular/core';
-import { BehaviorSubject, combineLatest, distinctUntilChanged, Observable } from 'rxjs';
+import {
+  BehaviorSubject,
+  combineLatest,
+  debounceTime,
+  distinctUntilChanged,
+  Observable,
+} from 'rxjs';
 import { CCTTransitionTask } from './cct-transition';
 import { listen } from '@tauri-apps/api/event';
 import {
@@ -39,14 +45,20 @@ export class CCTControlService {
       this.cctControlEnabled = settings.cctControlEnabled;
       if (!this.initialized) {
         this.setCCT(this.cct);
-        combineLatest([this.openvr.status, this.openvr.devices]).subscribe(([status, devices]) => {
-          const ready = status === 'INITIALIZED' && !!devices.length && devices[0]?.class === 'HMD';
-          if (ready && !this.hardwareReady) {
+        combineLatest([this.openvr.status, this.openvr.devices])
+          .pipe(debounceTime(100))
+          .subscribe(([status, devices]) => {
+            const ready =
+              status === 'INITIALIZED' &&
+              !!devices.length &&
+              devices.find((d) => d.index === 0)?.class === 'HMD';
+            if (ready && !this.hardwareReady) {
+              console.log({ ready, hardwareReady: this.hardwareReady });
+              this.hardwareReady = ready;
+              this.setCCT(this.cct, SET_BRIGHTNESS_OR_CCT_OPTIONS_DEFAULTS, true);
+            }
             this.hardwareReady = ready;
-            this.setCCT(this.cct, SET_BRIGHTNESS_OR_CCT_OPTIONS_DEFAULTS, true);
-          }
-          this.hardwareReady = ready;
-        });
+          });
       }
       this.initialized = true;
     });

src-ui/app/views/dashboard-view/views/brightness-automations-view/tabs/new-brightness-automations-tab/brightness-automation-config-label/brightness-automation-config-label.component.html

@@ -1,19 +1,19 @@
 <div class="label" *ngIf="config">
   <div class="colortemp-container" @hshrink *ngIf="config?.changeColorTemperature && cctControlEnabled">
     <div class="colortemp-icon" [style.background-color]="getCSSColorForCCT(config.colorTemperature)"></div>
-    <span>{{ config.colorTemperature }} K</span>
+    <span class="monospace">{{ config.colorTemperature }}K</span>
   </div>
   <div class="brightness-container" *ngIf="config?.changeBrightness" @hshrink>
     <div class="brightness-value" *ngIf="!advancedMode" @vshrink>
-      <span>{{ config.brightness }}%</span>
+      <span class="monospace">{{ config.brightness }}%</span>
       <i class="material-icons">brightness_6</i>
     </div>
     <div class="brightness-value" *ngIf="advancedMode" @vshrink>
-      <span>{{ config.softwareBrightness }}%</span>
+      <span class="monospace">{{ config.softwareBrightness }}%</span>
       <i class="material-symbols-outlined icon-filled">image</i>
     </div>
     <div class="brightness-value" *ngIf="advancedMode" @vshrink>
-      <span>{{ config.hardwareBrightness }}%</span>
+      <span class="monospace">{{ config.hardwareBrightness }}%</span>
       <i class="material-symbols-outlined">monitor</i>
     </div>
   </div>

src-ui/app/views/dashboard-view/views/brightness-automations-view/tabs/new-brightness-automations-tab/brightness-automation-config-label/brightness-automation-config-label.component.scss

@@ -88,3 +88,7 @@
     }
   }
 }
+
+.monospace {
+  font-family: 'Fira Code', monospace !important;
+}

src-ui/styles/typography.scss

@@ -1,3 +1,5 @@
+@import '@fontsource/fira-code/index.css';
+
 * {
   font-family: 'Poppins', 'Noto Sans JP', 'Noto Sans KR', 'Noto Sans TC', 'Noto Sans SC', sans-serif;
   letter-spacing: 0.025em;