fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-19 02:48:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Miscellaneous minor code cleanup

Browse Source 
# Conflicts:
#	graphene/Cargo.toml
This commit is contained in:
Keavon Chambers
2021-08-12 20:34:36 -07:00
parent db2fe322c3
commit 35d7fe8860
20 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/components/widgets/buttons/IconButton.vue
View File

@@ -53,6 +53,7 @@
<script lang="ts">
import { defineComponent } from "vue";
import IconLabel from "@/components/widgets/labels/IconLabel.vue";
export default defineComponent({

1
frontend/src/components/widgets/buttons/PopoverButton.vue
View File

@@ -49,6 +49,7 @@
<script lang="ts">
import { defineComponent } from "vue";
import IconButton from "@/components/widgets/buttons/IconButton.vue";
import FloatingMenu, { MenuDirection, MenuType } from "@/components/widgets/floating-menus/FloatingMenu.vue";

1
frontend/src/components/widgets/buttons/TextButton.vue
View File

@@ -50,6 +50,7 @@
<script lang="ts">
import { defineComponent } from "vue";
import TextLabel from "@/components/widgets/labels/TextLabel.vue";
export default defineComponent({

13
frontend/src/components/widgets/floating-menus/ColorPicker.vue
View File

@@ -118,6 +118,7 @@
<script lang="ts">
import { defineComponent } from "vue";
import { hsvToRgb, rgbToHsv, isRGB } from "@/utilities/color";
import { clamp } from "@/utilities/math";
@@ -220,21 +221,21 @@ export default defineComponent({
updateRects() {
const { colorPicker } = this.$data._;
const saturationPicker = this.getRef<HTMLDivElement>("saturationPicker");
const saturationPicker = this.getRef<HTMLElement>("saturationPicker");
const saturation = saturationPicker.getBoundingClientRect();
colorPicker.saturation.rect.width = saturation.width;
colorPicker.saturation.rect.height = saturation.height;
colorPicker.saturation.rect.left = saturation.left;
colorPicker.saturation.rect.top = saturation.top;
const huePicker = this.getRef<HTMLDivElement>("huePicker");
const huePicker = this.getRef<HTMLElement>("huePicker");
const hue = huePicker.getBoundingClientRect();
colorPicker.hue.rect.width = hue.width;
colorPicker.hue.rect.height = hue.height;
colorPicker.hue.rect.left = hue.left;
colorPicker.hue.rect.top = hue.top;
const opacityPicker = this.getRef<HTMLDivElement>("opacityPicker");
const opacityPicker = this.getRef<HTMLElement>("opacityPicker");
const opacity = opacityPicker.getBoundingClientRect();
colorPicker.opacity.rect.width = opacity.width;
colorPicker.opacity.rect.height = opacity.height;
@@ -243,7 +244,7 @@ export default defineComponent({
},
setSaturationPosition(x: number, y: number) {
const { colorPicker } = this.$data._;
const saturationCursor = this.getRef<HTMLDivElement>("saturationCursor");
const saturationCursor = this.getRef<HTMLElement>("saturationCursor");
const saturationPosition = [clamp(x, 0, colorPicker.saturation.rect.width), clamp(y, 0, colorPicker.saturation.rect.height)];
saturationCursor.style.transform = `translate(${saturationPosition[0]}px, ${saturationPosition[1]}px)`;
colorPicker.color.s = saturationPosition[0] / colorPicker.saturation.rect.width;
@@ -251,14 +252,14 @@ export default defineComponent({
},
setHuePosition(y: number) {
const { colorPicker } = this.$data._;
const hueCursor = this.getRef<HTMLDivElement>("hueCursor");
const hueCursor = this.getRef<HTMLElement>("hueCursor");
const huePosition = clamp(y, 0, colorPicker.hue.rect.height);
hueCursor.style.transform = `translateY(${huePosition}px)`;
colorPicker.color.h = clamp(1 - huePosition / colorPicker.hue.rect.height);
},
setOpacityPosition(y: number) {
const { colorPicker } = this.$data._;
const opacityCursor = this.getRef<HTMLDivElement>("opacityCursor");
const opacityCursor = this.getRef<HTMLElement>("opacityCursor");
const opacityPosition = clamp(y, 0, colorPicker.opacity.rect.height);
opacityCursor.style.transform = `translateY(${opacityPosition}px)`;
colorPicker.color.a = clamp(1 - opacityPosition / colorPicker.opacity.rect.height);

1
frontend/src/components/widgets/floating-menus/MenuList.vue
View File

@@ -133,6 +133,7 @@
<script lang="ts">
import { defineComponent, PropType } from "vue";
import { keyboardLockApiSupported } from "@/utilities/fullscreen";
import { SeparatorDirection, SeparatorType } from "@/components/widgets/widgets";

1
frontend/src/components/widgets/inputs/CheckboxInput.vue
View File

@@ -81,6 +81,7 @@
<script lang="ts">
import { defineComponent } from "vue";
import IconLabel from "@/components/widgets/labels/IconLabel.vue";
export default defineComponent({

1
frontend/src/components/widgets/inputs/DropdownInput.vue
View File

@@ -89,6 +89,7 @@
<script lang="ts">
import { defineComponent, PropType } from "vue";
import IconLabel from "@/components/widgets/labels/IconLabel.vue";
import MenuList, { MenuListEntry, SectionsOfMenuListEntries } from "@/components/widgets/floating-menus/MenuList.vue";
import { MenuDirection } from "@/components/widgets/floating-menus/FloatingMenu.vue";

1
frontend/src/components/widgets/inputs/OptionalInput.vue
View File

@@ -35,6 +35,7 @@
<script lang="ts">
import { defineComponent } from "vue";
import CheckboxInput from "@/components/widgets/inputs/CheckboxInput.vue";
export default defineComponent({

1
frontend/src/components/widgets/inputs/ShelfItemInput.vue
View File

@@ -31,6 +31,7 @@
<script lang="ts">
import { defineComponent } from "vue";
import IconButton from "@/components/widgets/buttons/IconButton.vue";
export default defineComponent({

1
frontend/src/components/widgets/labels/UserInputLabel.vue
View File

@@ -90,6 +90,7 @@
<script lang="ts">
import { defineComponent } from "vue";
import IconLabel from "@/components/widgets/labels/IconLabel.vue";
export enum MouseInputInteraction {

2
frontend/src/components/widgets/options/ToolOptions.vue
View File

@@ -26,8 +26,8 @@
import { defineComponent } from "vue";
import { comingSoon } from "@/utilities/errors";
import { WidgetRow, SeparatorType, IconButtonWidget } from "@/components/widgets/widgets";
import Separator from "@/components/widgets/separators/Separator.vue";
import IconButton from "@/components/widgets/buttons/IconButton.vue";
import PopoverButton from "@/components/widgets/buttons/PopoverButton.vue";

1
frontend/src/components/widgets/separators/Separator.vue
View File

@@ -70,6 +70,7 @@
<script lang="ts">
import { defineComponent } from "vue";
import { SeparatorDirection, SeparatorType } from "@/components/widgets/widgets";
export default defineComponent({