Skip to content
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.

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

fix(screensharing): performance and ux improvements #1003

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
6 changes: 4 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,10 @@ module.exports = {
// It works fine on server because by default in @nextcloud/eslint-config .vue files are not inspected via eslint-plugin-import thus import/extensions doesn't include .vue
// See: https://github.com/import-js/eslint-plugin-import/blob/main/README.md#importextensions
'import/default': 'off',
// import/namespace is not compatible with TS/JS mix
// Not compatible with TS/JS mix
'import/namespace': 'off',
// Not compatible with TS/JS mix or reexports
'import/named': 'off',
/**
* ESLint
*/
Expand Down Expand Up @@ -135,7 +137,7 @@ module.exports = {

overrides: [
{
files: '*.ts',
files: ['*.ts', '*.vue'],
rules: {
'jsdoc/require-returns-type': 'off', // TODO upstream
},
Expand Down
5 changes: 5 additions & 0 deletions src/global.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ declare module '*.svg' {
export default url
}

declare module '*.svg?raw' {
const url: string
export default url
}

declare module 'vue-material-design-icons/*.vue' {
import type { Component } from 'vue'
const component: Component<Record<string, never>, Record<string, never>, Record<string, never>, { size: number }, Record<string, never>>
Expand Down
5 changes: 2 additions & 3 deletions src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const { createAuthenticationWindow } = require('./authentication/authentication.
const { openLoginWebView } = require('./authentication/login.window.js')
const { createHelpWindow } = require('./help/help.window.js')
const { createUpgradeWindow } = require('./upgrade/upgrade.window.js')
const { systemInfo, isLinux, isMac, isWayland, isWindows } = require('./app/system.utils.ts')
const { systemInfo, isLinux, isMac, isWindows } = require('./app/system.utils.ts')
const { createTalkWindow } = require('./talk/talk.window.js')
const { createWelcomeWindow } = require('./welcome/welcome.window.js')
const { installVueDevtools } = require('./install-vue-devtools.js')
Expand Down Expand Up @@ -94,8 +94,7 @@ ipcMain.handle('app:getDesktopCapturerSources', async () => {
return null
}

// We cannot show live previews on Wayland, so we show thumbnails
const thumbnailWidth = isWayland ? 320 : 0
const thumbnailWidth = 800

const sources = await desktopCapturer.getSources({
types: ['screen', 'window'],
Expand Down
2 changes: 1 addition & 1 deletion src/shared/globals/globals.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { translate, translatePlural } from '@nextcloud/l10n'
import { appData } from '../../app/AppData.js'
import { dialogs } from './OC/dialogs.js'
import { MimeTypeList } from './OC/mimetype.js'
import { getDesktopMediaSource } from '../../talk/renderer/getDesktopMediaSource.js'
import { getDesktopMediaSource } from '../../talk/renderer/screensharing/screensharing.module.ts'

let enabledAbsoluteWebroot = false

Expand Down
146 changes: 0 additions & 146 deletions src/talk/renderer/components/DesktopMediaSourceDialog.vue

This file was deleted.

178 changes: 0 additions & 178 deletions src/talk/renderer/components/DesktopMediaSourcePreview.vue

This file was deleted.

Loading