MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-05-06 14:46:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: add spacing option to friends locations card and favtories cards (#1477)

Browse Source
This commit is contained in:
pa
2025-11-12 16:12:45 +09:00
committed by Natsumi
parent dcd06ff6dd
commit a2f76d1a3e
6 changed files with 320 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/FriendsLocations/FriendsLocations.vue
+43 -8
View File
@@ -26,7 +26,7 @@
<div class="friend-view__settings-row">
<span class="friend-view__settings-label">Scale</span>
<div class="friend-view__scale-control">
<span class="friend-view__scale-value">{{ cardScalePercentLabel }} &nbsp;</span>
<span class="friend-view__scale-value">{{ cardScalePercentLabel }}&nbsp;</span>
<el-slider
v-model="cardScale"
class="friend-view__slider"
@@ -36,6 +36,19 @@
:show-tooltip="false" />
</div>
</div>
<div class="friend-view__settings-row">
<span class="friend-view__settings-label">Spacing</span>
<div class="friend-view__scale-control">
<span class="friend-view__scale-value">{{ cardSpacingPercentLabel }}&nbsp;</span>
<el-slider
v-model="cardSpacing"
class="friend-view__slider"
:min="0.5"
:max="1.5"
:step="0.05"
:show-tooltip="false" />
</div>
</div>
</el-popover>
</div>
</div>
@@ -66,7 +79,8 @@
v-for="friend in group.friends"
:key="friend.id ?? friend.userId ?? friend.displayName"
:friend="friend"
:card-scale="cardScale" />
:card-scale="cardScale"
:card-spacing="cardSpacing" />
</div>
</section>
</div>
@@ -96,6 +110,7 @@
:key="friend.id ?? friend.userId ?? friend.displayName"
:friend="friend"
:card-scale="cardScale"
:card-spacing="cardSpacing"
:display-instance-info="false" />
</div>
</section>
@@ -111,7 +126,8 @@
v-for="entry in mergedOnlineEntries"
:key="entry.id ?? entry.friend.id ?? entry.friend.displayName"
:friend="entry.friend"
:card-scale="cardScale" />
:card-scale="cardScale"
:card-spacing="cardSpacing" />
</div>
<div v-if="!mergedSameInstanceGroups.length && !mergedOnlineEntries.length" class="friend-view__empty">
No matching friends
@@ -123,7 +139,8 @@
v-for="entry in visibleFriends"
:key="entry.id ?? entry.friend.id ?? entry.friend.displayName"
:friend="entry.friend"
:card-scale="cardScale" />
:card-scale="cardScale"
:card-spacing="cardSpacing" />
</div>
<div v-else class="friend-view__empty">No matching friends</div>
</template>
@@ -175,6 +192,7 @@
);
const cardScaleBase = ref(1);
const cardSpacingBase = ref(1);
const cardScale = computed({
get: () => cardScaleBase.value,
@@ -184,7 +202,16 @@
}
});
const cardSpacing = computed({
get: () => cardSpacingBase.value,
set: (value) => {
cardSpacingBase.value = value;
configRepository.setString('VRCX_FriendLocationCardSpacing', value.toString());
}
});
const cardScalePercentLabel = computed(() => `${Math.round(cardScale.value * 100)}%`);
const cardSpacingPercentLabel = computed(() => `${Math.round(cardSpacing.value * 100)}%`);
const showSameInstanceBase = ref(false);
@@ -457,8 +484,9 @@
const baseWidth = 220;
const baseGap = 14;
const scale = cardScale.value;
const spacing = cardSpacing.value;
const minWidth = baseWidth * scale;
const gap = baseGap + (scale - 1) * 10;
const gap = Math.max(6, (baseGap + (scale - 1) * 10) * spacing);
return (count = 1, options = {}) => {
const containerWidth = Math.max(gridWidth.value ?? 0, 0);
@@ -493,7 +521,8 @@
'--friend-card-min-width': `${Math.round(minWidth)}px`,
'--friend-card-gap': `${Math.round(gap)}px`,
'--friend-card-target-width': `${Math.round(cardWidth)}px`,
'--friend-grid-columns': `${columns}`
'--friend-grid-columns': `${columns}`,
'--friend-card-spacing': `${spacing.toFixed(2)}`
};
};
});
@@ -577,7 +606,7 @@
}
);
watch(cardScale, () => {
watch([cardScale, cardSpacing], () => {
if (!settingsReady.value) {
return;
}
@@ -620,8 +649,9 @@
async function loadInitialSettings() {
try {
const [storedScale, storedShowSameInstance] = await Promise.all([
const [storedScale, storedSpacing, storedShowSameInstance] = await Promise.all([
configRepository.getString('VRCX_FriendLocationCardScale', '1'),
configRepository.getString('VRCX_FriendLocationCardSpacing', '1'),
configRepository.getBool('VRCX_FriendLocationShowSameInstance', null)
]);
@@ -630,6 +660,11 @@
cardScaleBase.value = parsedScale;
}
const parsedSpacing = parseFloat(storedSpacing);
if (!Number.isNaN(parsedSpacing) && parsedSpacing > 0) {
cardSpacingBase.value = parsedSpacing;
}
if (storedShowSameInstance !== null && storedShowSameInstance !== undefined) {
showSameInstanceBase.value = Boolean(storedShowSameInstance);
}