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: handle background blur in Talk if server doesn't support it #13507

Open
wants to merge 3 commits into
base: main
Choose a base branch
from

Conversation

Antreesy
Copy link
Contributor

@Antreesy Antreesy commented Oct 10, 2024

☑️ Resolves

  • partially reverts ed39a6b
  • returns compatibility for Talk Desktop with versions below 29.0.4

🖌️ UI Checklist

🖼️ Screenshots / Screencasts

🏚️ Before 🏡 After
image image

🏁 Checklist

  • 🌏 Tested with different browsers / clients:
    • Chromium (Chrome / Edge / Opera / Brave)
    • Firefox
    • Safari
    • Talk Desktop
    • Not risky to browser differences / client
  • 🖌️ Design was reviewed, approved or inspired by the design team
  • ⛑️ Tests are included or not possible
  • 📗 User documentation in https://github.com/nextcloud/documentation/tree/master/user_manual/talk has been updated or is not required

@Antreesy Antreesy added this to the 🖤 Next Major (31) milestone Oct 10, 2024
@Antreesy Antreesy self-assigned this Oct 10, 2024
@Antreesy
Copy link
Contributor Author

@Antreesy
Copy link
Contributor Author

/backport to stable30

Copy link
Contributor

@DorraJaouad DorraJaouad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't tested yet 🚧

src/components/CallView/CallView.vue Outdated Show resolved Hide resolved
src/components/CallView/CallView.vue Outdated Show resolved Hide resolved
src/components/SettingsDialog/SettingsDialog.vue Outdated Show resolved Hide resolved
src/components/SettingsDialog/SettingsDialog.vue Outdated Show resolved Hide resolved
src/components/CallView/CallView.vue Show resolved Hide resolved
src/components/CallView/CallView.vue Show resolved Hide resolved
src/components/CallView/CallView.vue Outdated Show resolved Hide resolved
- partially reverts ed39a6b

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
- post-review refactoring

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
@Antreesy Antreesy force-pushed the fix/12633/check-server-version-for-blur branch from d979129 to 21c4620 Compare October 11, 2024 08:25
@Antreesy
Copy link
Contributor Author

Antreesy commented Oct 11, 2024

rebased onto webpack-vue-config 6.2.0, all changes since last review are in 2nd commit (for backport to 29)

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
Comment on lines +384 to +395
/**
* Fallback style for versions before v29.0.4
*/
callContainerStyle() {
if (serverSupportsBackgroundBlurred) {
return
}

return {
'backdrop-filter': this.isBackgroundBlurred ? 'blur(25px)' : 'none',
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick: instead of adding an inline styles object here, it's better to bind a class in the template and add styles in <style>

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I couldn't find a nice-looking solution, given that we need to overwrite any backdrop value coming from server. See screenshot from 29.0.3:
image
Any thoughts? can also keep only 'blur none' option for DefaultTheme and not affect HighContrast ones?

Comment on lines 162 to 163
const serverVersion = loadState('core', 'config', {}).versionstring ?? '29.0.0'
const serverSupportsBackgroundBlurred = '29.0.4'.localeCompare(serverVersion) < 1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why fallback to '29.0.0'?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't backport further, so i think, it would be enough for this exact feature

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But it is about server version, not Talk version, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, we get NC server version, as this is where blur toggle was implemented in User settings

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants