Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: position of scaled module description being off in clickgui #3860

Merged
merged 1 commit into from
Sep 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src-theme/src/routes/clickgui/ClickGui.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import {onMount} from "svelte";
import {getComponents, getGameWindow, getModules, getModuleSettings} from "../../integration/rest";
import {getGameWindow, getModules, getModuleSettings} from "../../integration/rest";
import {groupByCategory} from "../../integration/util";
import type {GroupedModules, Module} from "../../integration/types";
import Panel from "./Panel.svelte";
Expand All @@ -9,13 +9,15 @@
import {fade} from "svelte/transition";
import {listen} from "../../integration/ws";
import type {ClickGuiScaleChangeEvent, ScaleFactorChangeEvent} from "../../integration/events";
import {scaleFactor} from "./clickgui_store";

let categories: GroupedModules = {};
let modules: Module[] = [];
let minecraftScaleFactor = 2;
let clickGuiScaleFactor = 1;
$: scaleFactor = minecraftScaleFactor * clickGuiScaleFactor;
$: zoom = scaleFactor * 50;
$: {
scaleFactor.set(minecraftScaleFactor * clickGuiScaleFactor);
}

onMount(async () => {
const gameWindow = await getGameWindow();
Expand All @@ -38,12 +40,12 @@
</script>

<div class="clickgui" transition:fade|global={{duration: 200}}
style="transform: scale({zoom}%); width: {2 / scaleFactor * 100}vw; height: {2 / scaleFactor * 100}vh;">
style="transform: scale({$scaleFactor * 50}%); width: {2 / $scaleFactor * 100}vw; height: {2 / $scaleFactor * 100}vh;">
<Description/>
<Search modules={structuredClone(modules)}/>

{#each Object.entries(categories) as [category, modules], panelIndex}
<Panel {category} {modules} {panelIndex} {scaleFactor}/>
<Panel {category} {modules} {panelIndex}/>
{/each}
</div>

Expand Down
6 changes: 4 additions & 2 deletions src-theme/src/routes/clickgui/Module.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import {description as descriptionStore, highlightModuleName} from "./clickgui_store";
import {setItem} from "../../integration/persistent_storage";
import {convertToSpacedString, spaceSeperatedNames} from "../../theme/theme_config";
import {scaleFactor} from "./clickgui_store";

export let name: string;
export let enabled: boolean;
Expand Down Expand Up @@ -63,9 +64,10 @@
if (aliases.length > 0) {
moduleDescription += ` (aka ${aliases.map(a => $spaceSeperatedNames ? convertToSpacedString(a) : a).join(", ")})`;
}
console.log($scaleFactor)
descriptionStore.set({
x,
y,
x: x * (2 / $scaleFactor),
y: y * (2 / $scaleFactor),
description: moduleDescription
});
}
Expand Down
12 changes: 6 additions & 6 deletions src-theme/src/routes/clickgui/Panel.svelte
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import {afterUpdate, onMount} from "svelte";
import {onMount} from "svelte";
import type {Module as TModule} from "../../integration/types";
import {listen} from "../../integration/ws";
import Module from "./Module.svelte";
Expand All @@ -8,11 +8,11 @@
import {quintOut} from "svelte/easing";
import {highlightModuleName, maxPanelZIndex} from "./clickgui_store";
import {setItem} from "../../integration/persistent_storage";
import {scaleFactor} from "./clickgui_store";

export let category: string;
export let modules: TModule[];
export let panelIndex: number;
export let scaleFactor: number;

let panelElement: HTMLElement;
let modulesElement: HTMLElement;
Expand Down Expand Up @@ -77,8 +77,8 @@
}

function fixPosition() {
panelConfig.left = clamp(panelConfig.left, 0, document.documentElement.clientWidth * (2 / scaleFactor) - panelElement.offsetWidth);
panelConfig.top = clamp(panelConfig.top, 0, document.documentElement.clientHeight * (2 / scaleFactor) - panelElement.offsetHeight);
panelConfig.left = clamp(panelConfig.left, 0, document.documentElement.clientWidth * (2 / $scaleFactor) - panelElement.offsetWidth);
panelConfig.top = clamp(panelConfig.top, 0, document.documentElement.clientHeight * (2 / $scaleFactor) - panelElement.offsetHeight);
}

function onMouseDown() {
Expand All @@ -89,8 +89,8 @@

function onMouseMove(e: MouseEvent) {
if (moving) {
panelConfig.left += (e.screenX - prevX) * (2 / scaleFactor);
panelConfig.top += (e.screenY - prevY) * (2 / scaleFactor);
panelConfig.left += (e.screenX - prevX) * (2 / $scaleFactor);
panelConfig.top += (e.screenY - prevY) * (2 / $scaleFactor);
}

prevX = e.screenX;
Expand Down
4 changes: 3 additions & 1 deletion src-theme/src/routes/clickgui/clickgui_store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@ export const description: Writable<TDescription | null> = writable(null);

export const maxPanelZIndex: Writable<number> = writable(0);

export const highlightModuleName: Writable<string | null> = writable(null);
export const highlightModuleName: Writable<string | null> = writable(null);

export const scaleFactor: Writable<number> = writable(2);
Loading