Undo fix(tiling) pop-os#1171

Author: LinuxHeki

dark.css

@@ -60,7 +60,3 @@
 .pop-shell-tab-urgent {
     background: #D00;
 }
-
-.pop-shell-entry:indeterminate {
-    font-style: italic
-}

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
+}

light.css

@@ -60,7 +60,3 @@
 .pop-shell-tab-urgent {
     background: #D00;
 }
-
-.pop-shell-entry:indeterminate {
-    font-style: italic
-}

src/auto_tiler.ts

@@ -685,9 +685,9 @@ export class AutoTiler {
             return Err('focused window is not attached');
         }
 
-        return onto.workspace_id() == win.workspace_id()
+        return onto.meta.get_monitor() == win.meta.get_monitor() && onto.workspace_id() == win.workspace_id()
             ? Ok(onto)
-            : Err('window is not on the same workspace');
+            : Err('window is not on the same monitor or workspace');
     }
 
     private toggle_orientation_(ext: Ext, focused: ShellWindow): Result<void, string> {

src/config.ts

@@ -38,6 +38,7 @@ export const DEFAULT_FLOAT_RULES: Array<FloatRule> = [
     { class: "KotatogramDesktop", title: "Media viewer" },
     { class: "Steam", title: "^((?!Steam).)*$" },
     { class: "TelegramDesktop", title: "Media viewer" },
+    { class: "tilda", },
     { class: "Solaar", },
     { class: "system76-driver", },
     { class: "zoom", },

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));
 
@@ -249,8 +250,8 @@ export class Ext extends Ecs.System<ExtEvent> {
             for (const window of this.tab_list(Meta.TabList.NORMAL, null)) {
                 wins.push([
                     window.entity,
-                    window.meta.get_title(),
-                    window.name(this),
+                    window.title(),
+                    window.name(this)
                 ])
             }
 
@@ -500,7 +501,7 @@ export class Ext extends Ecs.System<ExtEvent> {
                 let wmclass = win.meta.get_wm_class();
                 if (wmclass) this.conf.add_window_exception(
                     wmclass,
-                    win.meta.get_title()
+                    win.title()
                 );
                 this.exception_dialog()
             },
@@ -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 */
@@ -2048,7 +2057,7 @@ export class Ext extends Ecs.System<ExtEvent> {
                 let actor = window.meta.get_compositor_private();
                 if (actor) {
                     if (!window.meta.minimized) {
-                        tiler.auto_tile(this, window, true);
+                        tiler.auto_tile(this, window, false);
                     }
                 }
             }

src/mod.d.ts

@@ -195,7 +195,7 @@ declare namespace Meta {
         get_pid(): number;
         get_role(): null | string;
         get_stable_sequence(): number;
-        get_title(): string;
+        get_title(): null | string;
         get_transient_for(): Window | null;
         get_user_time(): number;
         get_wm_class(): string | null;

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 {

src/stack.ts

@@ -92,7 +92,7 @@ export class Stack {
         if (!this.widgets) return;
 
         const entity = window.entity;
-        const label = window.meta.get_title();
+        const label = window.title()
         const active = Ecs.entity_eq(entity, this.active);
 
         const button: St.Button = new St.Button({
@@ -421,7 +421,7 @@ export class Stack {
             }
 
             this.watch_signals(this.active_id, c.button, window);
-            this.buttons.get(c.button)?.set_label(window.meta.get_title());
+            this.buttons.get(c.button)?.set_label(window.title());
             this.activate(window.entity);
         }
     }
@@ -576,7 +576,7 @@ export class Stack {
         this.tabs[comp].signals = [
             window.meta.connect('notify::title', () => {
                 this.window_exec(comp, entity, (window) => {
-                    this.buttons.get(button)?.set_label(window.meta.get_title())
+                    this.buttons.get(button)?.set_label(window.title())
                 });
             }),
 

src/window.ts

@@ -298,7 +298,7 @@ export class ShellWindow {
                 // If a window lacks a class, it's probably a web browser dialog
                 && wm_class !== null
                 // Blacklist any windows that happen to leak through our filter
-                && !ext.conf.window_shall_float(wm_class, this.meta.get_title());
+                && !ext.conf.window_shall_float(wm_class, this.title());
         };
 
         return !ext.contains_tag(this.entity, Tags.Floating)
@@ -402,6 +402,11 @@ export class ShellWindow {
         this.move(ext, br, () => place_pointer_on(this.ext.conf.default_pointer_position, this.meta));
     }
 
+    title(): string {
+        const title = this.meta.get_title();
+        return title ? title : this.name(this.ext)
+    }
+
 
     wm_role(): string | null {
         return this.extra.wm_role_.get_or_init(() => {