From 34e34b9620d88b5d76b87a4bbcd473c2fc6002a9 Mon Sep 17 00:00:00 2001
From: Terry Truong <terry06890@gmail.com>
Date: Mon, 28 Mar 2022 11:49:12 +1100
Subject: Rename Settings to SettingsPane, and ParentBar to AncestryBar

---
 src/components/AncestryBar.vue  |  74 +++++++++++++++++++++++++
 src/components/ParentBar.vue    |  74 -------------------------
 src/components/Settings.vue     | 117 ----------------------------------------
 src/components/SettingsPane.vue | 117 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 191 insertions(+), 191 deletions(-)
 create mode 100644 src/components/AncestryBar.vue
 delete mode 100644 src/components/ParentBar.vue
 delete mode 100644 src/components/Settings.vue
 create mode 100644 src/components/SettingsPane.vue

(limited to 'src/components')

diff --git a/src/components/AncestryBar.vue b/src/components/AncestryBar.vue
new file mode 100644
index 0000000..2e0d5d0
--- /dev/null
+++ b/src/components/AncestryBar.vue
@@ -0,0 +1,74 @@
+<script lang="ts">
+import {defineComponent, PropType} from 'vue';
+import {LayoutNode} from '../lib';
+import TileImg from './TileImg.vue'
+
+export default defineComponent({
+	props: {
+		pos: {type: Array as unknown as PropType<[number,number]>, required: true},
+		dims: {type: Array as unknown as PropType<[number,number]>, required: true},
+		nodes: {type: Array as PropType<LayoutNode[]>, required: true},
+		options: {type: Object, required: true},
+	},
+	data(){
+		return {
+			tileMargin: 5, //px (gap between detached-ancestor tiles)
+			scrollBarOffset: 10, //px (gap for scrollbar, used to prevent overlap with tiles)
+		};
+	},
+	computed: {
+		wideArea(){
+			return this.dims[0] >= this.dims[1];
+		},
+		tileSz(){
+			return (this.wideArea ? this.dims[1] : this.dims[0]) - (this.tileMargin * 2) - this.scrollBarOffset;
+		},
+		hasOverflow(){
+			let len = this.tileMargin + (this.tileSz + this.tileMargin) * this.nodes.length;
+			return len > (this.wideArea ? this.dims[0] : this.dims[1]);
+		},
+		styles(): Record<string,string> {
+			return {
+				position: 'absolute',
+				left: this.pos[0] + 'px',
+				top: this.pos[1] + 'px',
+				width: (this.dims[0] + (this.wideArea || this.hasOverflow ? 0 : -this.scrollBarOffset)) + 'px',
+				height: (this.dims[1] + (!this.wideArea || this.hasOverflow ? 0 : -this.scrollBarOffset)) + 'px',
+				overflowX: this.wideArea ? 'auto' : 'hidden',
+				overflowY: this.wideArea ? 'hidden' : 'auto',
+				// Extra padding for scrollbar inclusion
+				paddingRight: (this.hasOverflow && !this.wideArea ? this.scrollBarOffset : 0) + 'px',
+				paddingBottom: (this.hasOverflow && this.wideArea ? this.scrollBarOffset : 0) + 'px',
+				// For child layout
+				display: 'flex',
+				flexDirection: this.wideArea ? 'row' : 'column',
+				gap: this.tileMargin + 'px',
+				padding: this.tileMargin + 'px',
+				//
+				backgroundColor: '#44403c',
+				boxShadow: this.options.shadowNormal,
+			};
+		},
+	},
+	methods: {
+		onClick(node: LayoutNode){
+			this.$emit('detached-ancestor-clicked', node);
+		},
+		onInnerInfoIconClicked(data: LayoutNode){
+			this.$emit('info-icon-clicked', data);
+		}
+	},
+	components: {
+		TileImg,
+	},
+	emits: ['detached-ancestor-clicked', 'info-icon-clicked'],
+});
+</script>
+
+<template>
+<div :style="styles">
+	<tile-img v-for="node in nodes" :key="node.tolNode.name"
+		:layoutNode="node" :tileSz="tileSz" :options="options"
+		@click="onClick(node)" @info-icon-clicked="onInnerInfoIconClicked"/>
+</div>
+</template>
diff --git a/src/components/ParentBar.vue b/src/components/ParentBar.vue
deleted file mode 100644
index 0f73008..0000000
--- a/src/components/ParentBar.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-<script lang="ts">
-import {defineComponent, PropType} from 'vue';
-import {LayoutNode} from '../lib';
-import TileImg from './TileImg.vue'
-
-export default defineComponent({
-	props: {
-		pos: {type: Array as unknown as PropType<[number,number]>, required: true},
-		dims: {type: Array as unknown as PropType<[number,number]>, required: true},
-		nodes: {type: Array as PropType<LayoutNode[]>, required: true},
-		options: {type: Object, required: true},
-	},
-	data(){
-		return {
-			tileMargin: 5, //px (gap between separated-parent tiles)
-			scrollBarOffset: 10, //px (gap for scrollbar, used to prevent overlap with tiles)
-		};
-	},
-	computed: {
-		wideArea(){
-			return this.dims[0] >= this.dims[1];
-		},
-		tileSz(){
-			return (this.wideArea ? this.dims[1] : this.dims[0]) - (this.tileMargin * 2) - this.scrollBarOffset;
-		},
-		hasOverflow(){
-			let len = this.tileMargin + (this.tileSz + this.tileMargin) * this.nodes.length;
-			return len > (this.wideArea ? this.dims[0] : this.dims[1]);
-		},
-		styles(): Record<string,string> {
-			return {
-				position: 'absolute',
-				left: this.pos[0] + 'px',
-				top: this.pos[1] + 'px',
-				width: (this.dims[0] + (this.wideArea || this.hasOverflow ? 0 : -this.scrollBarOffset)) + 'px',
-				height: (this.dims[1] + (!this.wideArea || this.hasOverflow ? 0 : -this.scrollBarOffset)) + 'px',
-				overflowX: this.wideArea ? 'auto' : 'hidden',
-				overflowY: this.wideArea ? 'hidden' : 'auto',
-				// Extra padding for scrollbar inclusion
-				paddingRight: (this.hasOverflow && !this.wideArea ? this.scrollBarOffset : 0) + 'px',
-				paddingBottom: (this.hasOverflow && this.wideArea ? this.scrollBarOffset : 0) + 'px',
-				// For child layout
-				display: 'flex',
-				flexDirection: this.wideArea ? 'row' : 'column',
-				gap: this.tileMargin + 'px',
-				padding: this.tileMargin + 'px',
-				//
-				backgroundColor: '#44403c',
-				boxShadow: this.options.shadowNormal,
-			};
-		},
-	},
-	methods: {
-		onClick(node: LayoutNode){
-			this.$emit('sepd-parent-clicked', node);
-		},
-		onInnerInfoIconClicked(data: LayoutNode){
-			this.$emit('info-icon-clicked', data);
-		}
-	},
-	components: {
-		TileImg,
-	},
-	emits: ['sepd-parent-clicked', 'info-icon-clicked'],
-});
-</script>
-
-<template>
-<div :style="styles">
-	<tile-img v-for="node in nodes" :key="node.tolNode.name"
-		:layoutNode="node" :tileSz="tileSz" :options="options"
-		@click="onClick(node)" @info-icon-clicked="onInnerInfoIconClicked"/>
-</div>
-</template>
diff --git a/src/components/Settings.vue b/src/components/Settings.vue
deleted file mode 100644
index 4fa3e03..0000000
--- a/src/components/Settings.vue
+++ /dev/null
@@ -1,117 +0,0 @@
-<script lang="ts">
-import {defineComponent, PropType} from 'vue';
-import type {LayoutOptions} from '../lib';
-
-export default defineComponent({
-	props: {
-		layoutOptions: {type: Object as PropType<LayoutOptions>, required: true},
-		componentOptions: {type: Object, required: true},
-	},
-	methods: {
-		closeClicked(evt: Event){
-			if (evt.target == this.$el || (this.$refs.closeIcon as HTMLElement).contains(evt.target as HTMLElement)){
-				this.$emit('settings-close');
-			}
-		},
-		onLayoutOptChg(){
-			this.$emit('layout-option-change');
-		},
-		onMinTileSzChg(){
-			let minInput = this.$refs.minTileSzInput as HTMLInputElement;
-			let maxInput = this.$refs.maxTileSzInput as HTMLInputElement;
-			if (Number(minInput.value) > Number(maxInput.value)){
-				this.layoutOptions.maxTileSz = this.layoutOptions.minTileSz;
-			}
-			this.onLayoutOptChg();
-		},
-		onMaxTileSzChg(){
-			let minInput = this.$refs.minTileSzInput as HTMLInputElement;
-			let maxInput = this.$refs.maxTileSzInput as HTMLInputElement;
-			if (Number(maxInput.value) < Number(minInput.value)){
-				this.layoutOptions.minTileSz = this.layoutOptions.maxTileSz;
-			}
-			this.onLayoutOptChg();
-		},
-	},
-	emits: ['settings-close', 'layout-option-change', ],
-});
-</script>
-
-<template>
-<div class="absolute bottom-4 right-4 min-w-[5cm] p-3 bg-stone-50 visible rounded-md shadow shadow-black">
-	<svg class="block absolute top-2 right-2 w-6 h-6 hover:cursor-pointer" @click="closeClicked" ref="closeIcon">
-		<use href="#svg-close"/>
-	</svg>
-	<h1 class="text-xl font-bold mb-2">Settings</h1>
-	<hr class="border-stone-400"/>
-	<div>
-		<label>Tile Spacing <input type="range" min="0" max="20" class="mx-2 w-[3cm]"
-			v-model.number="layoutOptions.tileSpacing" @input="onLayoutOptChg"/></label>
-	</div>
-	<hr class="border-stone-400"/>
-	<div>
-		<label>
-			<span class="inline-block w-[3cm]">Min Tile Size</span>
-			<input type="range" min="0" max="400" v-model.number="layoutOptions.minTileSz" class="w-[3cm]"
-				@input="onMinTileSzChg" ref="minTileSzInput"/>
-		</label>
-	</div>
-	<div>
-		<label>
-			<span class="inline-block w-[3cm]">Max Tile Size</span>
-			<input type="range" min="0" max="400" v-model.number="layoutOptions.maxTileSz" class="w-[3cm]"
-				@input="onMaxTileSzChg" ref="maxTileSzInput"/>
-		</label>
-	</div>
-	<hr class="border-stone-400"/>
-	<div>
-		Layout Method
-		<ul>
-			<li>
-				<label> <input type="radio" v-model="layoutOptions.layoutType" value="sqr"
-					@change="onLayoutOptChg"/> Squares </label>
-			</li>
-			<li>
-				<label> <input type="radio" v-model="layoutOptions.layoutType" value="rect"
-					@change="onLayoutOptChg"/> Rectangles </label>
-			</li>
-			<li>
-				<label> <input type="radio" v-model="layoutOptions.layoutType" value="sweep"
-					@change="onLayoutOptChg"/> Sweep to side </label>
-			</li>
-		</ul>
-	</div>
-	<hr class="border-stone-400"/>
-	<div>
-		<label> <input type="checkbox" v-model="layoutOptions.sweepingToParent"
-			@change="onLayoutOptChg"/> Sweep to parent</label>
-	</div>
-	<hr class="border-stone-400"/>
-	<div>
-		Sweep Mode
-		<ul>
-			<li>
-				<label> <input type="radio" v-model="layoutOptions.sweepMode" value="left"
-					@change="onLayoutOptChg"/> To left </label>
-			</li>
-			<li>
-				<label> <input type="radio" v-model="layoutOptions.sweepMode" value="top"
-					@change="onLayoutOptChg"/> To top </label>
-			</li>
-			<li>
-				<label> <input type="radio" v-model="layoutOptions.sweepMode" value="shorter"
-					@change="onLayoutOptChg"/> To shorter </label>
-			</li>
-			<li>
-				<label> <input type="radio" v-model="layoutOptions.sweepMode" value="auto"
-					@change="onLayoutOptChg"/> Auto </label>
-			</li>
-		</ul>
-	</div>
-	<hr class="border-stone-400"/>
-	<div>
-		<label>Animation Speed <input type="range" min="0" max="1000" class="mx-2 w-[3cm]"
-			v-model.number="componentOptions.transitionDuration"/></label>
-	</div>
-</div>
-</template>
diff --git a/src/components/SettingsPane.vue b/src/components/SettingsPane.vue
new file mode 100644
index 0000000..4fa3e03
--- /dev/null
+++ b/src/components/SettingsPane.vue
@@ -0,0 +1,117 @@
+<script lang="ts">
+import {defineComponent, PropType} from 'vue';
+import type {LayoutOptions} from '../lib';
+
+export default defineComponent({
+	props: {
+		layoutOptions: {type: Object as PropType<LayoutOptions>, required: true},
+		componentOptions: {type: Object, required: true},
+	},
+	methods: {
+		closeClicked(evt: Event){
+			if (evt.target == this.$el || (this.$refs.closeIcon as HTMLElement).contains(evt.target as HTMLElement)){
+				this.$emit('settings-close');
+			}
+		},
+		onLayoutOptChg(){
+			this.$emit('layout-option-change');
+		},
+		onMinTileSzChg(){
+			let minInput = this.$refs.minTileSzInput as HTMLInputElement;
+			let maxInput = this.$refs.maxTileSzInput as HTMLInputElement;
+			if (Number(minInput.value) > Number(maxInput.value)){
+				this.layoutOptions.maxTileSz = this.layoutOptions.minTileSz;
+			}
+			this.onLayoutOptChg();
+		},
+		onMaxTileSzChg(){
+			let minInput = this.$refs.minTileSzInput as HTMLInputElement;
+			let maxInput = this.$refs.maxTileSzInput as HTMLInputElement;
+			if (Number(maxInput.value) < Number(minInput.value)){
+				this.layoutOptions.minTileSz = this.layoutOptions.maxTileSz;
+			}
+			this.onLayoutOptChg();
+		},
+	},
+	emits: ['settings-close', 'layout-option-change', ],
+});
+</script>
+
+<template>
+<div class="absolute bottom-4 right-4 min-w-[5cm] p-3 bg-stone-50 visible rounded-md shadow shadow-black">
+	<svg class="block absolute top-2 right-2 w-6 h-6 hover:cursor-pointer" @click="closeClicked" ref="closeIcon">
+		<use href="#svg-close"/>
+	</svg>
+	<h1 class="text-xl font-bold mb-2">Settings</h1>
+	<hr class="border-stone-400"/>
+	<div>
+		<label>Tile Spacing <input type="range" min="0" max="20" class="mx-2 w-[3cm]"
+			v-model.number="layoutOptions.tileSpacing" @input="onLayoutOptChg"/></label>
+	</div>
+	<hr class="border-stone-400"/>
+	<div>
+		<label>
+			<span class="inline-block w-[3cm]">Min Tile Size</span>
+			<input type="range" min="0" max="400" v-model.number="layoutOptions.minTileSz" class="w-[3cm]"
+				@input="onMinTileSzChg" ref="minTileSzInput"/>
+		</label>
+	</div>
+	<div>
+		<label>
+			<span class="inline-block w-[3cm]">Max Tile Size</span>
+			<input type="range" min="0" max="400" v-model.number="layoutOptions.maxTileSz" class="w-[3cm]"
+				@input="onMaxTileSzChg" ref="maxTileSzInput"/>
+		</label>
+	</div>
+	<hr class="border-stone-400"/>
+	<div>
+		Layout Method
+		<ul>
+			<li>
+				<label> <input type="radio" v-model="layoutOptions.layoutType" value="sqr"
+					@change="onLayoutOptChg"/> Squares </label>
+			</li>
+			<li>
+				<label> <input type="radio" v-model="layoutOptions.layoutType" value="rect"
+					@change="onLayoutOptChg"/> Rectangles </label>
+			</li>
+			<li>
+				<label> <input type="radio" v-model="layoutOptions.layoutType" value="sweep"
+					@change="onLayoutOptChg"/> Sweep to side </label>
+			</li>
+		</ul>
+	</div>
+	<hr class="border-stone-400"/>
+	<div>
+		<label> <input type="checkbox" v-model="layoutOptions.sweepingToParent"
+			@change="onLayoutOptChg"/> Sweep to parent</label>
+	</div>
+	<hr class="border-stone-400"/>
+	<div>
+		Sweep Mode
+		<ul>
+			<li>
+				<label> <input type="radio" v-model="layoutOptions.sweepMode" value="left"
+					@change="onLayoutOptChg"/> To left </label>
+			</li>
+			<li>
+				<label> <input type="radio" v-model="layoutOptions.sweepMode" value="top"
+					@change="onLayoutOptChg"/> To top </label>
+			</li>
+			<li>
+				<label> <input type="radio" v-model="layoutOptions.sweepMode" value="shorter"
+					@change="onLayoutOptChg"/> To shorter </label>
+			</li>
+			<li>
+				<label> <input type="radio" v-model="layoutOptions.sweepMode" value="auto"
+					@change="onLayoutOptChg"/> Auto </label>
+			</li>
+		</ul>
+	</div>
+	<hr class="border-stone-400"/>
+	<div>
+		<label>Animation Speed <input type="range" min="0" max="1000" class="mx-2 w-[3cm]"
+			v-model.number="componentOptions.transitionDuration"/></label>
+	</div>
+</div>
+</template>
-- 
cgit v1.2.3