Redo materia fill popout so that it isn't too wide on mobile, fix a bug

xiv-gear-planner · Nov 4, 2024 · 9654815 · 9654815
1 parent 4a392b1
commit 9654815
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/packages/common-ui/styles/common.less b/packages/common-ui/styles/common.less
@@ -1950,7 +1950,7 @@ div.gear-set-editor-toolbar, set-view-toolbar {
           position: relative;
           // These need to not be the real drag target
           pointer-events: none;
-          padding: 1px;
+          padding: 4px;
           width: 25px;
           text-align: center;
 

diff --git a/packages/frontend/src/scripts/components/gear_edit_toolbar.ts b/packages/frontend/src/scripts/components/gear_edit_toolbar.ts
@@ -79,8 +79,8 @@ export class ToolbarButtonsArea extends HTMLDivElement {
         });
         this.popoutArea.addEventListener('mousedown', evStop);
         this.popoutArea.addEventListener('mouseup', evStop);
-        this.popoutArea.addEventListener('pointerdown', evStop);
-        this.popoutArea.addEventListener('pointerup', evStop);
+        // this.popoutArea.addEventListener('pointerdown', evStop);
+        // this.popoutArea.addEventListener('pointerup', evStop);
         this.replaceChildren(this.undoButton, this.redoButton);
     }
 
@@ -106,9 +106,6 @@ export class ToolbarButtonsArea extends HTMLDivElement {
         const button = makeActionButton(label, (ev) => {
             outer.setActivePopout(button, popoutElement);
         });
-        button.addEventListener('pointerdown', ev => {
-            console.log(ev);
-        });
         button.classList.add('popout-button');
         this.appendChild(button);
         this.panelButtons.push(button);

diff --git a/packages/frontend/src/scripts/components/materia.ts b/packages/frontend/src/scripts/components/materia.ts
@@ -22,7 +22,7 @@ import {
 } from "@xivgear/common-ui/components/util";
 import {GearPlanSheet} from "@xivgear/core/sheet";
 import {recordCurrentSheetEvent, recordEvent} from "@xivgear/core/analytics/analytics";
-import { GearPlanSheetGui } from "./sheet";
+import {GearPlanSheetGui} from "./sheet";
 
 /**
  * Component for managing all materia slots on an item
@@ -424,8 +424,10 @@ export class MateriaPriorityPicker extends HTMLElement {
         minGcdInput.pattern = '\\d\\.\\d\\d?';
         minGcdInput.title = 'Enter the minimum desired GCD in the form x.yz.\nSkS/SpS materia will be de-prioritized once this target GCD is met.';
         minGcdInput.classList.add('min-gcd-input');
-        this.replaceChildren(header, drag, minGcdText, minGcdInput, document.createElement('br'),
-            solveMelds, fillEmptyNow, fillAllNow, fillModeLabel, fillModeDropdown);
+        this.replaceChildren(header, drag, document.createElement('br'),
+            minGcdText, minGcdInput, document.createElement('br'),
+            fillModeLabel, fillModeDropdown, document.createElement('br'),
+            solveMelds, fillEmptyNow, fillAllNow);
     }
 }