feat: Improved HighContrast Support

Author: mmstick

highcontrast.css

@@ -0,0 +1,66 @@
+.pop-shell-active-hint {
+    border-style: solid;
+    border-color: #FBB86C;
+    border-radius: 5px;
+    box-shadow: inset 0 0 0 1px rgba(24, 23, 23, 0)
+}
+
+.pop-shell-overlay {
+    background-color: rgba(53, 132, 228, 0.3);
+}
+
+.pop-shell-border-normal {
+    border-width: 3px;
+}
+
+.pop-shell-border-maximize {
+    border-width: 3px;
+}
+
+.pop-shell-search-element:select{
+    background: #fff;
+    border-radius: 5px;
+    color: #000;
+}
+
+.pop-shell-search-icon {
+    margin-right: 10px;
+}
+
+.pop-shell-search-cat {
+    margin-right: 10px;
+}
+
+.pop-shell-search-element {
+    padding-left: 10px;
+    padding-right: 2px;
+    padding-top: 6px;
+    padding-bottom: 6px;
+}
+
+.pop-shell-gaps-entry {
+    /* Seems to get the width just right to fit 3 digits */
+    width: 75px;
+}
+
+.pop-shell-tab {
+    border: 1px solid #333;
+    color: #000;
+    padding: 0 1em;
+}
+
+.pop-shell-tab-active {
+    background: #FBB86C;
+}
+
+.pop-shell-tab-inactive {
+    background: #9B8E8A;
+}
+
+.pop-shell-tab-urgent {
+    background: #D00;
+}
+
+.pop-shell-entry:indeterminate {
+    font-style: italic
+}

src/extension.ts

@@ -52,11 +52,11 @@ const { Workspace } = imports.ui.workspace;
 const { WorkspaceThumbnail } = imports.ui.workspaceThumbnail;
 const Tags = Me.imports.tags;
 
-const STYLESHEET_PATHS = ['light', 'dark'].map(stylesheet_path);
+const STYLESHEET_PATHS = ['light', 'dark', 'highcontrast'].map(stylesheet_path);
 const STYLESHEETS = STYLESHEET_PATHS.map((path) => Gio.File.new_for_path(path));
 const GNOME_VERSION = imports.misc.config.PACKAGE_VERSION;
 
-enum Style { Light, Dark }
+enum Style { Light, Dark, HighContrast }
 
 interface Display {
     area: Rectangle;
@@ -108,7 +108,7 @@ export class Ext extends Ecs.System<ExtEvent> {
     column_size: number = 32;
 
     /** The currently-loaded theme variant */
-    current_style: Style = this.settings.is_dark_shell() ? Style.Dark : Style.Light;
+    current_style: Style = Style.Dark;
 
     /** Set when the display configuration has been triggered for execution */
     displays_updating: SignalID | null = null;
@@ -215,6 +215,7 @@ export class Ext extends Ecs.System<ExtEvent> {
         super(new Executor.GLibExecutor());
 
         this.load_settings();
+        this.reload_theme()
 
         this.register_fn(() => load_theme(this.current_style));
 
@@ -1379,11 +1380,19 @@ export class Ext extends Ecs.System<ExtEvent> {
     }
 
     on_gtk_shell_changed() {
-        load_theme(this.settings.is_dark_shell() ? Style.Dark : Style.Light);
+        this.reload_theme();
+        load_theme(this.current_style)
     }
 
     on_gtk_theme_change() {
-        load_theme(this.settings.is_dark_shell() ? Style.Dark : Style.Light);
+        this.reload_theme()
+        load_theme(this.current_style)
+    }
+
+    reload_theme() {
+        this.current_style = this.settings.is_dark()
+            ? Style.Dark
+            : this.settings.is_high_contrast() ? Style.HighContrast : Style.Light
     }
 
     /** Handle window maximization notifications */

src/settings.ts

@@ -1,5 +1,5 @@
-const ExtensionUtils = imports.misc.extensionUtils;
-const extension = ExtensionUtils.getCurrentExtension();
+const Me = imports.misc.extensionUtils.getCurrentExtension();
+
 const { Gio, Gdk } = imports.gi;
 
 const DARK = ["dark", "adapta", "plata", "dracula"]
@@ -31,7 +31,7 @@ function settings_new_id(schema_id: string): Settings | null {
 
 function settings_new_schema(schema: string): Settings {
     const GioSSS = Gio.SettingsSchemaSource;
-    const schemaDir = extension.dir.get_child("schemas");
+    const schemaDir = Me.dir.get_child("schemas");
 
     let schemaSource = schemaDir.query_exists(null) ?
         GioSSS.new_from_directory(schemaDir.get_path(), GioSSS.get_default(), false) :
@@ -41,7 +41,7 @@ function settings_new_schema(schema: string): Settings {
 
     if (!schemaObj) {
         throw new Error("Schema " + schema + " could not be found for extension "
-            + extension.metadata.uuid + ". Please check your installation.")
+            + Me.metadata.uuid + ". Please check your installation.")
     }
 
     return new Gio.Settings({ settings_schema: schemaObj });
@@ -62,7 +62,7 @@ const LOG_LEVEL = "log-level";
 const SHOW_SKIPTASKBAR = "show-skip-taskbar";
 
 export class ExtensionSettings {
-    ext: Settings = settings_new_schema(extension.metadata["settings-schema"]);
+    ext: Settings = settings_new_schema(Me.metadata["settings-schema"]);
     int: Settings | null = settings_new_id("org.gnome.desktop.interface");
     mutter: Settings | null = settings_new_id("org.gnome.mutter");
     shell: Settings | null = settings_new_id("org.gnome.shell.extensions.user-theme");
@@ -100,21 +100,21 @@ export class ExtensionSettings {
         return rgba;
     }
 
-    is_dark(): boolean {
-        if (this.int) {
-            let theme = this.int.get_string("gtk-theme").toLowerCase();
-            return DARK.some(dark => theme.includes(dark))
-        }
+    theme(): string {
+        return this.shell
+            ? this.shell.get_string("name")
+            : this.int
+                ? this.int.get_string("gtk-theme")
+                : "Adwaita"
+    }
 
-        return false
+    is_dark(): boolean {
+        const theme = this.theme().toLowerCase()
+        return DARK.some(dark => theme.includes(dark))
     }
 
-    is_dark_shell(): boolean {
-        if (this.shell) {
-            let theme = this.shell.get_string("name").toLowerCase()
-            return DARK.some(dark => theme.includes(dark) || theme.length === 0)
-        }
-        return this.is_dark();
+    is_high_contrast(): boolean {
+        return this.theme().toLowerCase() === "highcontrast"
     }
 
     row_size(): number {