Skip to content

Add the option to have the type list on the bottom of the screen #1577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mattdawkins wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add the option to have the type list on the bottom of the screen #1577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
238 changes: 131 additions & 107 deletions client/dive-common/components/ControlsContainer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ export default defineComponent({
type: Boolean as PropType<boolean>,
required: true,
},
bottomLayout: {
type: Boolean,
default: false,
},
},
setup(_, { emit }) {
const handler = useHandler();
Expand Down Expand Up @@ -150,12 +154,15 @@ export default defineComponent({
<template>
<v-col
dense
style="position:absolute; bottom: 0px; padding: 0px; margin:0px;"
:style="bottomLayout
? 'position: relative; padding: 0px; margin: 0px; width: 100%;'
: 'position: absolute; bottom: 0px; padding: 0px; margin: 0px;'"
>
<Controls :is-default-image="isDefaultImage" :dataset-type="datasetType">
<Controls :is-default-image="isDefaultImage" :dataset-type="datasetType" :bottom-layout="bottomLayout">
<template slot="timelineControls">
<div style="min-width: 270px">
<div :style="{ 'min-width': bottomLayout ? 'auto' : '270px', 'white-space': 'nowrap' }">
<v-tooltip
v-if="!bottomLayout"
open-delay="200"
bottom
>
Expand Down Expand Up @@ -304,114 +311,118 @@ export default defineComponent({
</div>
</template>
<template #middle>
<file-name-time-display
v-if="datasetType === 'image-sequence' || datasetType === 'large-image'"
class="text-middle px-3"
display-type="filename"
/>
<span v-else-if="datasetType === 'video'">
<span class="mr-2">
<v-menu
:close-on-content-click="false"
top
offset-y
nudge-left="3"
open-on-hover
close-delay="500"
open-delay="250"
>
<template #activator="{ on }">
<v-icon
@click="(!volume && setVolume(1)) || (volume && setVolume(0))"
v-on="on"
> {{ volume === 0 ? 'mdi-volume-off' : 'mdi-volume-medium' }}
</v-icon>
</template>
<v-card style="overflow:hidden; width:60px;">
<v-slider
:value="volume"
min="0"
max="1.0"
step="0.05"
vertical
@change="setVolume"
/>
<v-row dense align="center">
<b class="ma-auto">{{ volume * 100 }}%</b>
</v-row>

</v-card>
</v-menu>
</span>
<span class="mr-2">
<v-menu
:close-on-content-click="false"
top
offset-y
nudge-left="3"
open-on-hover
close-delay="500"
open-delay="250"
rounded="lg"
>
<template #activator="{ on }">
<v-badge
:value="speed != 1.0"
color="#0277bd88"
:content="`${speed}X`"
offset-y="5px"
overlap
>
<div :class="{ 'middle-content-bottom': bottomLayout }">
<file-name-time-display
v-if="datasetType === 'image-sequence' || datasetType === 'large-image'"
class="text-middle px-3"
display-type="filename"
/>
<span v-else-if="datasetType === 'video'">
<span class="mr-2">
<v-menu
:close-on-content-click="false"
top
offset-y
nudge-left="3"
open-on-hover
close-delay="500"
open-delay="250"
>
<template #activator="{ on }">
<v-icon
@click="(!volume && setVolume(1)) || (volume && setVolume(0))"
v-on="on"
@click="setSpeed(1)"
> mdi-speedometer
>
{{ volume === 0 ? 'mdi-volume-off' : 'mdi-volume-medium' }}
</v-icon>
</v-badge>
</template>
<v-card style="overflow:hidden; width:60px;">
<v-slider
:value="ticks.indexOf(speed)"
min="0"
:max="ticks.length - 1"
step="1"
ticks="always"
:tick-size="4"
style="font-size:0.75em;"
vertical
hide-details
@input="setSpeed(ticks[$event])"
/>
<v-row dense align="center">
<b class="ma-auto">{{ speed }}x</b>
</v-row>
</v-card>
</v-menu>
</span>
<file-name-time-display
class="text-middle pl-2"
display-type="time"
/>
</span>
<v-tooltip
open-delay="200"
bottom
>
<template #activator="{ on }">
<v-icon
small
class="mx-2"
v-on="on"
>
mdi-information
</v-icon>
</template>
<span>
annotation framerate may be downsampled.
<br>
frame numbers start at zero.
</template>
<v-card style="overflow:hidden; width:60px;">
<v-slider
:value="volume"
min="0"
max="1.0"
step="0.05"
vertical
@change="setVolume"
/>
<v-row dense align="center">
<b class="ma-auto">{{ volume * 100 }}%</b>
</v-row>
</v-card>
</v-menu>
</span>
<span class="mr-2">
<v-menu
:close-on-content-click="false"
top
offset-y
nudge-left="3"
open-on-hover
close-delay="500"
open-delay="250"
rounded="lg"
>
<template #activator="{ on }">
<v-badge
:value="speed != 1.0"
color="#0277bd88"
:content="`${speed}X`"
offset-y="5px"
overlap
>
<v-icon
v-on="on"
@click="setSpeed(1)"
>
mdi-speedometer
</v-icon>
</v-badge>
</template>
<v-card style="overflow:hidden; width:60px;">
<v-slider
:value="ticks.indexOf(speed)"
min="0"
:max="ticks.length - 1"
step="1"
ticks="always"
:tick-size="4"
style="font-size:0.75em;"
vertical
hide-details
@input="setSpeed(ticks[$event])"
/>
<v-row dense align="center">
<b class="ma-auto">{{ speed }}x</b>
</v-row>
</v-card>
</v-menu>
</span>
<file-name-time-display
class="text-middle pl-2"
display-type="time"
/>
</span>
</v-tooltip>
<v-tooltip
v-if="!bottomLayout"
open-delay="200"
bottom
>
<template #activator="{ on }">
<v-icon
small
class="mx-2"
v-on="on"
>
mdi-information
</v-icon>
</template>
<span>
annotation framerate may be downsampled.
<br>
frame numbers start at zero.
</span>
</v-tooltip>
</div>
</template>
</Controls>
<Timeline
Expand Down Expand Up @@ -490,4 +501,17 @@ export default defineComponent({
.timeline-button {
border: thin solid transparent;
}
.middle-content-bottom {
display: flex;
align-items: center;
white-space: nowrap;
overflow: hidden;
min-width: 0;
}
.middle-content-bottom .text-middle {
overflow: hidden;
text-overflow: ellipsis;
flex-shrink: 1;
min-width: 0;
}
</style>
3 changes: 2 additions & 1 deletion client/dive-common/components/EditorMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,8 +323,9 @@ export default defineComponent({
</v-btn>
</template>
<slot name="delete-controls" />
<slot name="multicam-controls-left" />
<v-spacer />
<slot name="multicam-controls" />
<slot name="multicam-controls-right" />
<v-spacer />
<annotation-visibility-menu
:visible-modes="visibleModes"
Expand Down
Loading
Loading