fix #332 - classic view navbar now respects "side (icon only)"
* removed `menuDisplay` computed variable * directly access `defaultStore` in `calcViewState` * actually call `calcViewState` at setup! all three these changes were copied from `universal.vue`, the default view.
This commit is contained in:
parent
bc02b4ae1f
commit
2017b763f2
|
@ -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,
|
||||||
|
|
Loading…
Reference in New Issue