Skip to content

Commit

Permalink
Redo materia fill popout so that it isn't too wide on mobile, fix a b…
Browse files Browse the repository at this point in the history
  • Loading branch information
xpdota authored Nov 4, 2024
1 parent 1016af9 commit ba83786
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion packages/common-ui/styles/common.less
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
7 changes: 2 additions & 5 deletions packages/frontend/src/scripts/components/gear_edit_toolbar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand All @@ -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);
Expand Down
8 changes: 5 additions & 3 deletions packages/frontend/src/scripts/components/materia.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
}
}

Expand Down

0 comments on commit ba83786

Please sign in to comment.