From d7132cfe8e9e1b079065db952ef1cb65256c890b Mon Sep 17 00:00:00 2001 From: booploops <49113086+booploops@users.noreply.github.com> Date: Sun, 10 Apr 2022 00:34:22 -0700 Subject: [PATCH] added UI Scale option under visual --- src/i18n/en_US.json | 1 + src/i18n/source/en_US.json | 1 + src/main/base/store.ts | 3 ++- src/renderer/main/vueapp.js | 7 +++++-- src/renderer/views/main.ejs | 2 +- src/renderer/views/pages/settings.ejs | 8 ++++++++ 6 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index 455a926e..1b71dabe 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -348,6 +348,7 @@ "settings.option.visual.hardwareAcceleration.description": "Requires relaunch", "settings.header.visual.hardwareAcceleration.default": "Default", "settings.header.visual.hardwareAcceleration.webGPU": "WebGPU", + "settings.option.visual.uiscale": "UI Scale", "settings.header.visual.theme": "Theme", "settings.option.visual.theme.github.download": "Install from GitHub URL", "settings.option.visual.theme.github.explore": "Explore GitHub Themes", diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json index 455a926e..1b71dabe 100644 --- a/src/i18n/source/en_US.json +++ b/src/i18n/source/en_US.json @@ -348,6 +348,7 @@ "settings.option.visual.hardwareAcceleration.description": "Requires relaunch", "settings.header.visual.hardwareAcceleration.default": "Default", "settings.header.visual.hardwareAcceleration.webGPU": "WebGPU", + "settings.option.visual.uiscale": "UI Scale", "settings.header.visual.theme": "Theme", "settings.option.visual.theme.github.download": "Install from GitHub URL", "settings.option.visual.theme.github.explore": "Explore GitHub Themes", diff --git a/src/main/base/store.ts b/src/main/base/store.ts index fc96d5dd..6d59627f 100644 --- a/src/main/base/store.ts +++ b/src/main/base/store.ts @@ -129,7 +129,8 @@ export class Store { "windowLayout": "default" }, "windowControlPosition": 0, // 0 default right - "nativeTitleBar": false + "nativeTitleBar": false, + "uiScale": 1.0 }, "lyrics": { "enable_mxm": false, diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index 0736cb4f..1cb68db9 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -465,8 +465,11 @@ const app = new Vue({ history.forward() }, getHTMLStyle() { - // document.querySelector("html").style.background = "#222"; - document.querySelector("body").classList.add("notransparency") + if(app.cfg.visual.uiScale != 1) { + document.querySelector("#app").style.zoom = app.cfg.visual.uiScale + }else{ + document.querySelector("#app").style.zoom = "" + } }, resetState() { this.menuPanel.visible = false; diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs index 59c221eb..15f02bf9 100644 --- a/src/renderer/views/main.ejs +++ b/src/renderer/views/main.ejs @@ -61,7 +61,7 @@ - +
<%- include("../assets/cider-round.svg") %>
diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index 9a8c4d02..a21bee83 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -310,6 +310,14 @@ +
+
+ {{$root.getLz('settings.option.visual.uiscale')}} +
+
+ +
+
{{$root.getLz('settings.option.visual.hardwareAcceleration')}}