From 94d5b8e3274941dba2c37dc663a7f3c31edbd217 Mon Sep 17 00:00:00 2001
From: "Mr. Stallion" <mrstallion@nobody.nowhere.fauxdomain.ext>
Date: Wed, 29 Dec 2021 13:22:48 -0600
Subject: [PATCH] Optional disable high contrast mode

---
 chat/SettingsView.vue         | 12 +++++++++++-
 chat/common.ts                |  1 +
 chat/interfaces.ts            |  1 +
 electron/Index.vue            |  3 ++-
 scss/themes/chat/dark.scss    |  4 ++++
 scss/themes/chat/default.scss |  5 +++++
 scss/themes/chat/light.scss   |  4 ++++
 7 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/chat/SettingsView.vue b/chat/SettingsView.vue
index 953410f..f18d34d 100644
--- a/chat/SettingsView.vue
+++ b/chat/SettingsView.vue
@@ -199,6 +199,13 @@
                 </label>
             </div>
 
+            <div class="form-group">
+                <label class="control-label" for="risingDisableWindowsHighContrast">
+                    <input type="checkbox" id="risingDisableWindowsHighContrast" v-model="risingDisableWindowsHighContrast"/>
+                    Disable high-contrast mode (Windows)
+                </label>
+            </div>
+
         </div>
         <div v-show="selectedTab === '3'">
             <template v-if="hidden.length">
@@ -268,6 +275,7 @@
 
         risingShowUnreadOfflineCount!: boolean;
         risingColorblindMode!: boolean;
+        risingDisableWindowsHighContrast!: boolean;
 
 
         async load(): Promise<void> {
@@ -305,6 +313,7 @@
             this.risingShowUnreadOfflineCount = settings.risingShowUnreadOfflineCount;
 
             this.risingColorblindMode = settings.risingColorblindMode;
+            this.risingDisableWindowsHighContrast = settings.risingDisableWindowsHighContrast;
         }
 
         async doImport(): Promise<void> {
@@ -359,7 +368,8 @@
                 risingComparisonInSearch: this.risingComparisonInSearch,
                 risingShowUnreadOfflineCount: this.risingShowUnreadOfflineCount,
 
-                risingColorblindMode: this.risingColorblindMode
+                risingColorblindMode: this.risingColorblindMode,
+                risingDisableWindowsHighContrast: this.risingDisableWindowsHighContrast
             };
             if(this.notifications) await core.notifications.requestPermission();
         }
diff --git a/chat/common.ts b/chat/common.ts
index d9b5c2b..d5e7e57 100644
--- a/chat/common.ts
+++ b/chat/common.ts
@@ -54,6 +54,7 @@ export class Settings implements ISettings {
 
     risingShowUnreadOfflineCount = true;
     risingColorblindMode = false;
+    risingDisableWindowsHighContrast: false;
 }
 
 
diff --git a/chat/interfaces.ts b/chat/interfaces.ts
index 747132b..3f5a151 100644
--- a/chat/interfaces.ts
+++ b/chat/interfaces.ts
@@ -221,6 +221,7 @@ export namespace Settings {
 
         readonly risingShowUnreadOfflineCount: boolean;
         readonly risingColorblindMode: boolean;
+        readonly risingDisableWindowsHighContrast: boolean;
     }
 }
 
diff --git a/electron/Index.vue b/electron/Index.vue
index e6720dd..8c8922a 100644
--- a/electron/Index.vue
+++ b/electron/Index.vue
@@ -489,7 +489,8 @@
           try {
             return {
               [`theme-${this.settings.theme}`]: true,
-              colorblindMode: core.state.settings.risingColorblindMode
+              colorblindMode: core.state.settings.risingColorblindMode,
+              disableWindowsHighContrast: core.state.settings.risingDisableWindowsHighContrast
             };
           } catch(err) {
             return { [`theme-${this.settings.theme}`]: true };
diff --git a/scss/themes/chat/dark.scss b/scss/themes/chat/dark.scss
index 1c4eeee..cee27f7 100644
--- a/scss/themes/chat/dark.scss
+++ b/scss/themes/chat/dark.scss
@@ -40,3 +40,7 @@
     --#{$varName}: #{$value};
   }
 }
+
+.disableWindowsHighContrast {
+  forced-colors-adjust: none !important;
+}
diff --git a/scss/themes/chat/default.scss b/scss/themes/chat/default.scss
index 0cf5681..74f6595 100644
--- a/scss/themes/chat/default.scss
+++ b/scss/themes/chat/default.scss
@@ -41,6 +41,11 @@
   }
 }
 
+.disableWindowsHighContrast {
+  forced-colors-adjust: none !important;
+}
+
+
 //@import "../../util/accecss";
 //
 //@include accecss(
diff --git a/scss/themes/chat/light.scss b/scss/themes/chat/light.scss
index d27368b..2935e30 100644
--- a/scss/themes/chat/light.scss
+++ b/scss/themes/chat/light.scss
@@ -40,3 +40,7 @@
     --#{$varName}: #{$value};
   }
 }
+
+.disableWindowsHighContrast {
+  forced-colors-adjust: none !important;
+}