Skip to content

Fullscreen - use Material Design icons #9484

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

Merged
nickvergessen merged 4 commits into from
May 8, 2023
Merged

Fullscreen - use Material Design icons #9484

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
557b221
Fullscreen - use Material Design icons
starypatyk May 5, 2023
4659906
Fullscreen --> Full screen
starypatyk May 6, 2023
87325a1
Wording in aria-label
starypatyk May 6, 2023
c9adfe2
Remove unused computed property iconFullscreen
starypatyk May 6, 2023
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
22 changes: 11 additions & 11 deletions src/components/TopBar/TopBarMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,13 @@
</NcActionButton>

<!-- Fullscreen -->
<NcActionButton :icon="iconFullscreen"
:aria-label="t('spreed', 'Toggle fullscreen')"
<NcActionButton :aria-label="t('spreed', 'Toggle full screen')"
:close-after-click="true"
@click="toggleFullscreen">
<template #icon>
<Fullscreen v-if="!isFullscreen" :size="20" />
<FullscreenExit v-else :size="20" />
</template>
{{ labelFullscreen }}
</NcActionButton>

Expand Down Expand Up @@ -147,6 +150,8 @@
import Cog from 'vue-material-design-icons/Cog.vue'
import DotsCircle from 'vue-material-design-icons/DotsCircle.vue'
import DotsHorizontal from 'vue-material-design-icons/DotsHorizontal.vue'
import Fullscreen from 'vue-material-design-icons/Fullscreen.vue'
import FullscreenExit from 'vue-material-design-icons/FullscreenExit.vue'
import HandBackLeft from 'vue-material-design-icons/HandBackLeft.vue'
import MicrophoneOff from 'vue-material-design-icons/MicrophoneOff.vue'
import RecordCircle from 'vue-material-design-icons/RecordCircle.vue'
Expand Down Expand Up @@ -182,6 +187,8 @@ export default {
PromotedView,
Cog,
DotsHorizontal,
Fullscreen,
FullscreenExit,
GridView,
HandBackLeft,
VideoIcon,
Expand Down Expand Up @@ -244,18 +251,11 @@ export default {
return this.$store.getters.isFullscreen()
},

iconFullscreen() {
if (this.isInCall) {
return 'forced-white icon-fullscreen'
}
return 'icon-fullscreen'
},

labelFullscreen() {
if (this.isFullscreen) {
return t('spreed', 'Exit fullscreen (F)')
return t('spreed', 'Exit full screen (F)')
}
return t('spreed', 'Fullscreen (F)')
return t('spreed', 'Full screen (F)')
},

isFileConversation() {
Expand Down