Add fullscreen and help to home navbar #173

Merged
jgeorgi merged 1 commits from xps-app-navbar into main 2024-04-13 02:29:00 +00:00
3 changed files with 22 additions and 14 deletions

View File

@@ -4,6 +4,7 @@ const state = reactive({
disclaimerAgreement: false, disclaimerAgreement: false,
enabledRegions: ['thorax','abdomen','limbs','head'], enabledRegions: ['thorax','abdomen','limbs','head'],
version: '0.5.0-rc', version: '0.5.0-rc',
fullscreen: false,
useExternal: 'optional', useExternal: 'optional',
siteDemo: false, siteDemo: false,
externalServerList: [] externalServerList: []
@@ -26,13 +27,27 @@ const getServerList = () => {
} }
} }
const toggleFullscreen = () => {
if (document.fullscreenElement) {
document.exitFullscreen().then( () => {
state.fullscreen = false
})
} else {
app.requestFullscreen().then( () => {
state.fullscreen = true
})
}
}
export default () => ({ export default () => ({
isAgreed: computed(() => state.disclaimerAgreement), isAgreed: computed(() => state.disclaimerAgreement),
isFullscreen: computed(() => state.fullscreen),
demoMode: computed(() => state.siteDemo), demoMode: computed(() => state.siteDemo),
externalType: computed(() => state.useExternal), externalType: computed(() => state.useExternal),
getRegions: computed(() => state.enabledRegions), getRegions: computed(() => state.enabledRegions),
getVersion: computed(() => state.version), getVersion: computed(() => state.version),
set, set,
agree, agree,
getServerList getServerList,
toggleFullscreen
}) })

View File

@@ -149,7 +149,6 @@
serverSettings: {}, serverSettings: {},
otherSettings: {}, otherSettings: {},
isCordova: !!window.cordova, isCordova: !!window.cordova,
isFullscreen: false,
uploadUid: null, uploadUid: null,
uploadDirty: false, uploadDirty: false,
modelLocation: '', modelLocation: '',
@@ -208,7 +207,7 @@
this.modelLoading = false this.modelLoading = false
}) })
} }
window.onresize = (e) => { this.selectChip('redraw') } window.onresize = (e) => { if (this.$refs.image_cvs) this.selectChip('redraw') }
}, },
computed: { computed: {
message () { message () {
@@ -471,17 +470,6 @@
} }
}) })
return cvsCoords return cvsCoords
},
toggleFullscreen() {
if (document.fullscreenElement) {
document.exitFullscreen().then( () => {
this.isFullscreen = false
})
} else {
app.requestFullscreen().then( () => {
this.isFullscreen = true
})
}
} }
} }
} }

View File

@@ -6,6 +6,10 @@
<f7-link icon-ios="f7:bars" icon-md="f7:bars" panel-open="left"></f7-link> <f7-link icon-ios="f7:bars" icon-md="f7:bars" panel-open="left"></f7-link>
</f7-nav-left> </f7-nav-left>
<f7-nav-title sliding>A.L.V.I.N.N.</f7-nav-title> <f7-nav-title sliding>A.L.V.I.N.N.</f7-nav-title>
<f7-nav-right>
<f7-link v-if="!isCordova" :icon-only="true" tooltip="Fullscreen" :icon-f7="isFullscreen ? 'viewfinder_circle_fill' : 'viewfinder'" @click="toggleFullscreen"></f7-link>
<f7-link :icon-only="true" tooltip="ALVINN help" icon-f7="question_circle_fill" href="/help/"></f7-link>
</f7-nav-right>
</f7-navbar> </f7-navbar>
<!-- Page content--> <!-- Page content-->
<div style="display: grid; grid-template-columns: 100%; grid-template-rows: min-content min-content min-content 1fr; align-content: stretch; gap: 15px; min-height: 0px; max-height: calc(100vh - (var(--f7-navbar-height) + var(--f7-safe-area-top))); height: calc(100vh - (var(--f7-navbar-height) + var(--f7-safe-area-top)));"> <div style="display: grid; grid-template-columns: 100%; grid-template-rows: min-content min-content min-content 1fr; align-content: stretch; gap: 15px; min-height: 0px; max-height: calc(100vh - (var(--f7-navbar-height) + var(--f7-safe-area-top))); height: calc(100vh - (var(--f7-navbar-height) + var(--f7-safe-area-top)));">
@@ -103,6 +107,7 @@
}, },
data () { data () {
return { return {
isCordova: !!window.cordova,
alphaCheck: false alphaCheck: false
} }
}, },