-
Notifications
You must be signed in to change notification settings - Fork 441
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #11903 from nextcloud/enh/11869/add-grabber-pointer
Fix(PresenterOverlay): Add grabbing cursor
- Loading branch information
Showing
3 changed files
with
181 additions
and
80 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,164 @@ | ||
| <!-- | ||
| - @copyright Copyright (c) 2024 Dorra Jaouad <dorra.jaoued1@gmail.com> | ||
| - | ||
| - @license AGPL-3.0-or-later | ||
| - | ||
| - This program is free software: you can redistribute it and/or modify | ||
| - it under the terms of the GNU Affero General Public License as | ||
| - published by the Free Software Foundation, either version 3 of the | ||
| - License, or (at your option) any later version. | ||
| - | ||
| - This program is distributed in the hope that it will be useful, | ||
| - but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| - GNU Affero General Public License for more details. | ||
| - | ||
| - You should have received a copy of the GNU Affero General Public License | ||
| - along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| --> | ||
| <template> | ||
| <VueDraggableResizable v-if="!isCollapsed" | ||
| :key="presenterOverlaySize" | ||
| parent | ||
| :resizable="false" | ||
| :h="presenterOverlaySize" | ||
| :w="presenterOverlaySize" | ||
| :x="10" | ||
| :y="10" | ||
| @dragging="isDragging = true" | ||
| @dragstop="isDragging = false"> | ||
| <VideoVue :token="token" | ||
| :class="{ 'dragging': isDragging }" | ||
| class="presenter-overlay__video" | ||
| :model="model" | ||
| :shared-data="sharedData" | ||
| is-presenter-overlay | ||
| un-selectable | ||
| hide-bottom-bar | ||
| @click-presenter="$emit('click')" /> | ||
| </VueDraggableResizable> | ||
|
|
||
| <!-- presenter button when presenter overlay is collapsed --> | ||
| <NcButton v-else | ||
| :aria-label="t('spreed', 'Show presenter')" | ||
| :title="t('spreed', 'Show presenter')" | ||
| class="presenter-overlay--collapsed" | ||
| type="tertiary-no-background" | ||
| @click="$emit('click')"> | ||
| <template #icon> | ||
| <AccountBox fill-color="#ffffff" :size="20" /> | ||
| </template> | ||
| </NcButton> | ||
| </template> | ||
|
|
||
| <script> | ||
|
|
||
| import VueDraggableResizable from 'vue-draggable-resizable' | ||
|
|
||
| import AccountBox from 'vue-material-design-icons/AccountBoxOutline.vue' | ||
|
|
||
| import NcButton from '@nextcloud/vue/dist/Components/NcButton.js' | ||
|
|
||
| import VideoVue from './VideoVue.vue' | ||
|
|
||
| export default { | ||
| name: 'PresenterOverlay', | ||
|
|
||
| components: { | ||
| AccountBox, | ||
| VueDraggableResizable, | ||
| NcButton, | ||
| VideoVue, | ||
| }, | ||
|
|
||
| props: { | ||
| token: { | ||
| type: String, | ||
| required: true, | ||
| }, | ||
|
|
||
| model: { | ||
| type: Object, | ||
| required: true, | ||
| }, | ||
|
|
||
| sharedData: { | ||
| type: Object, | ||
| required: true, | ||
| }, | ||
|
|
||
| isCollapsed: { | ||
| type: Boolean, | ||
| required: true, | ||
| }, | ||
| }, | ||
|
|
||
| emits: ['click'], | ||
|
|
||
| data() { | ||
| return { | ||
| presenterOverlaySize: 128, | ||
| isDragging: false, | ||
| } | ||
| }, | ||
|
|
||
| mounted() { | ||
| window.addEventListener('resize', this.updateSize) | ||
| }, | ||
|
|
||
| beforeDestroy() { | ||
| window.removeEventListener('resize', this.updateSize) | ||
| }, | ||
|
|
||
| methods: { | ||
| updateSize() { | ||
| this.presenterOverlaySize = Math.min(Math.max(window.innerWidth * 0.1, 100), 242) | ||
| }, | ||
| }, | ||
| } | ||
| </script> | ||
|
|
||
| <style lang="scss" scoped> | ||
| .presenter-overlay__video { | ||
| position: relative; | ||
| --max-size: 242px; | ||
| --min-size: 100px; | ||
| width: 10vw; | ||
| height: 10vw; | ||
| max-width: var(--max-size); | ||
| max-height: var(--max-size); | ||
| min-width: var(--min-size); | ||
| min-height: var(--min-size); | ||
| z-index: 10; | ||
|
|
||
| &:hover { | ||
| cursor: grab; | ||
| } | ||
|
|
||
| &.dragging { | ||
| cursor: grabbing; | ||
| } | ||
| } | ||
|
|
||
| .presenter-overlay--collapsed { | ||
| position: absolute !important; | ||
| opacity: .7; | ||
| bottom: 48px; | ||
| right: 0; | ||
|
|
||
| #call-container:hover & { | ||
| background-color: rgba(0, 0, 0, 0.1) !important; | ||
|
|
||
| &:hover, | ||
| &:focus { | ||
| opacity: 1; | ||
| background-color: rgba(0, 0, 0, 0.2) !important; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| :deep(div) { | ||
| // prevent default cursor | ||
| cursor: inherit; | ||
| } | ||
| </style> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters