Skip to content

fix: Non-number slideScale causing mispositioning #174

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
merged 1 commit into from
May 25, 2021
Merged

fix: Non-number slideScale causing mispositioning #174

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
4 changes: 2 additions & 2 deletions packages/client/internals/Settings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import { slideScale } from '../state'
import SelectList from './SelectList.vue'
import type { SelectionItem } from './types'

const items: SelectionItem<number | null>[] = [
const items: SelectionItem<number>[] = [
{
display: 'Fit',
value: null,
value: 0,
},
{
display: '1:1',
Expand Down
2 changes: 1 addition & 1 deletion packages/client/internals/SlideContainer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ if (props.width) {
const screenAspect = computed(() => width.value / height.value)

const scale = computed(() => {
if (props.scale != null)
if (props.scale)
return props.scale
if (screenAspect.value < slideAspect)
return width.value / slideWidth
Expand Down
2 changes: 1 addition & 1 deletion packages/client/state/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const isOnFocus = computed(() => ['BUTTON', 'A'].includes(activeElement.v

export const currentCamera = useStorage<string>('slidev-camera', 'default')
export const currentMic = useStorage<string>('slidev-mic', 'default')
export const slideScale = useStorage<number>('slidev-scale', null)
export const slideScale = useStorage<number>('slidev-scale', 0)

export const showEditor = useStorage('slidev-show-editor', false)
export const editorWidth = useStorage('slidev-editor-width', isClient ? window.innerWidth * 0.4 : 100)
Expand Down