amechama/sharkey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge: fix #332 - classic view navbar now respects "side (icon only)" (!630)

Browse Source 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/630

Closes #332

Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
This commit is contained in:
Marie 2024-10-03 17:39:32 +00:00
commit 0f71dc6a07
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/frontend/src/ui/classic.sidebar.vue
View File

@ -66,7 +66,6 @@ import { i18n } from '@/i18n.js';
const WINDOW_THRESHOLD = 1400; const WINDOW_THRESHOLD = 1400;
const menu = ref(defaultStore.state.menu); const menu = ref(defaultStore.state.menu);
const menuDisplay = computed(defaultStore.makeGetterSetter('menuDisplay'));
const otherNavItemIndicated = computed<boolean>(() => { const otherNavItemIndicated = computed<boolean>(() => {
for (const def in navbarItemDef) { for (const def in navbarItemDef) {
if (menu.value.includes(def)) continue; if (menu.value.includes(def)) continue;
@ -81,10 +80,12 @@ const iconOnly = ref(false);
const settingsWindowed = ref(false); const settingsWindowed = ref(false);
function calcViewState() { function calcViewState() {
iconOnly.value = (window.innerWidth <= WINDOW_THRESHOLD) || (menuDisplay.value === 'sideIcon'); iconOnly.value = (window.innerWidth <= WINDOW_THRESHOLD) || (defaultStore.state.menuDisplay === 'sideIcon');
settingsWindowed.value = (window.innerWidth > WINDOW_THRESHOLD); settingsWindowed.value = (window.innerWidth > WINDOW_THRESHOLD);
} }
calcViewState();
function more(ev: MouseEvent) { function more(ev: MouseEvent) {
const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')), { const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')), {
src: ev.currentTarget ?? ev.target, src: ev.currentTarget ?? ev.target,