Fix bug in workspace comparison

nothingislost · Sep 10, 2021 · a12f9b0 · a12f9b0
1 parent d7b7811
commit a12f9b0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/main.ts b/main.ts
@@ -18,11 +18,11 @@ export default class WorkspacePicker extends Plugin {
     const workspacePickerStatusBarItem = this.addStatusBarItem();
     this.workspacePlugin = this.app.internalPlugins.getPluginById("workspaces").instance as WorkspacePluginInstance;
 
-    const icon = workspacePickerStatusBarItem.createDiv("icon");
+    const icon = workspacePickerStatusBarItem.createSpan("status-bar-item-segment icon");
     setIcon(icon, "pane-layout"); //pane-layout
 
-    this.changeWorkspaceButton = workspacePickerStatusBarItem.createDiv({
-      cls: "status-bar-item mod-clickable",
+    this.changeWorkspaceButton = workspacePickerStatusBarItem.createSpan({
+      cls: "status-bar-item-segment name",
       text: this.workspacePlugin.activeWorkspace + (this.isWorkspaceModified() ? "*" : ""),
       prepend: false,
     });
@@ -48,12 +48,12 @@ export default class WorkspacePicker extends Plugin {
 
   isWorkspaceModified = () => {
     try { // this is to catch an on-resize related error when loading a new workspace
-      var {...currentWorkspace } = this.app.workspace.getLayout();
+      var currentWorkspace = JSON.parse(JSON.stringify(this.app.workspace.getLayout()))
     } catch {
       return false;
     } // remove the active property since we don't need it for comparison
     var activeWorkspaceName = this.workspacePlugin.activeWorkspace, // active workspace name
-      {...savedWorkspace } = this.workspacePlugin.workspaces[activeWorkspaceName];
+    savedWorkspace = JSON.parse(JSON.stringify(this.workspacePlugin.workspaces[activeWorkspaceName]))
     deleteProp(savedWorkspace, ["active", "dimension", "width"]);
     deleteProp(currentWorkspace, ["active", "dimension", "width"]);
     return !deepEqual(currentWorkspace, savedWorkspace); // via the fast-equals package

diff --git a/styles.css b/styles.css
@@ -33,20 +33,21 @@
   fill: var(--text-normal);
 }
 
-.status-bar .plugin-workspace-picker > .status-bar-item {
-  display: inline-block;
-  padding: 0;
-  margin: 0;
-  vertical-align: middle;
+.status-bar .plugin-workspace-picker .status-bar-item-segment.icon {
+  /* margin-right: 2px;
+  vertical-align: middle; */
+  position: absolute;
+  /* margin-top: 1px; */
 }
 
-.status-bar .plugin-workspace-picker .icon {
-  display: inline-block;
+.status-bar .plugin-workspace-picker .status-bar-item-segment.name {
+  margin-left: 1.4em;
 }
 
 .status-bar .plugin-workspace-picker .icon svg {
+  height: 16px;
+  width: 16px;
   vertical-align: text-top;
-  margin-right: 2px;
 }
 
 .workspace-picker-modal .workspace-item[contenteditable="true"] {