From 0862e60f2a1b8ab4d5488d33799f2de28e99b258 Mon Sep 17 00:00:00 2001 From: Warinyourself Date: Sun, 11 Dec 2022 23:07:12 +0300 Subject: [PATCH] Delete zoom controller from old webkit greeter --- .../settings/general/SettingsSelectors.tsx | 32 +++++++++++-------- src/style/components/settings/index.styl | 3 +- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/components/base/settings/general/SettingsSelectors.tsx b/src/components/base/settings/general/SettingsSelectors.tsx index 015514e..652e7ca 100644 --- a/src/components/base/settings/general/SettingsSelectors.tsx +++ b/src/components/base/settings/general/SettingsSelectors.tsx @@ -36,6 +36,23 @@ export default class SettingsSelectors extends Vue { } } + get isSupportFullApi() { + return AppModule.isSupportFullApi + } + + get zoomSlider() { + return this.buildSlider({ + label: this.$t('input.zoom-interface').toString(), + value: AppModule.zoom, + options: { + min: 0.5, + max: 2, + step: 0.1 + }, + callback: this.updateZoom + }) + } + changeLanguage(value: string) { this.$i18n.locale = value localStorage.setItem('language', value) @@ -72,19 +89,6 @@ export default class SettingsSelectors extends Vue { return } - get zoomSlider() { - return this.buildSlider({ - label: this.$t('input.zoom-interface').toString(), - value: AppModule.zoom, - options: { - min: 0.5, - max: 2, - step: 0.1 - }, - callback: this.updateZoom - }) - } - @Debounce(100) updateZoom(value: AppInputThemeValue) { setCSSVariable('--zoom', value + '' || '1') @@ -98,7 +102,7 @@ export default class SettingsSelectors extends Vue { { this.buildSelector('login-position.about', this.menuPositionItems, this.menuPositionValue, this.changeLoginPosition) } { !this.isViewThemeOnly && this.buildSelector('choice-desktop', generateDesktopIcons(), AppModule.currentDesktop?.key, this.changeDesktop) } { !this.isViewThemeOnly && this.buildSelector('choice-os', osList, AppModule.currentOs, this.changeOs) } - { !this.isViewThemeOnly && this.zoomSlider } + { !this.isViewThemeOnly && this.isSupportFullApi && this.zoomSlider } } } diff --git a/src/style/components/settings/index.styl b/src/style/components/settings/index.styl index 1e8aa6c..bc39bbd 100644 --- a/src/style/components/settings/index.styl +++ b/src/style/components/settings/index.styl @@ -8,11 +8,10 @@ .user-settings-themes display grid grid-template-columns repeat(3, 1fr) - grid-template-rows repeat(auto-fit, 150px) gap 8px .user-settings-theme - height 150px + height calc(80vmin / var(--zoom) / 5) display block width 100% object-fit cover