diff --git a/CHANGELOG.md b/CHANGELOG.md index d04de516..a920547d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [1.15.0](https://github.com/viarotel-org/escrcpy/compare/v1.14.3...v1.15.0) (2023-11-18) + + +### Features + +* 添加投屏窗口大小控制 ([97d7868](https://github.com/viarotel-org/escrcpy/commit/97d7868abaf321a5693b621b97af82ecf3fa9ada)) + + +### Performance Improvements + +* 🚀 Add window position option ([866aa2c](https://github.com/viarotel-org/escrcpy/commit/866aa2cfd253f702112367a857c88c40714c1065)) + ## [1.14.3](https://github.com/viarotel-org/escrcpy/compare/v1.14.2...v1.14.3) (2023-11-17) diff --git a/package.json b/package.json index 868b8b3c..51e3d678 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "escrcpy", - "version": "1.14.3", + "version": "1.15.0", "private": true, "description": "Scrcpy Powered by Electron", "author": "viarotel", diff --git a/src/locales/languages/en_US.json b/src/locales/languages/en_US.json index be064794..0ffa9d52 100644 --- a/src/locales/languages/en_US.json +++ b/src/locales/languages/en_US.json @@ -231,6 +231,16 @@ "preferences.window.always-top.placeholder": "Keep control window topmost", "preferences.window.disable-screen-saver.name": "Disable Screensaver", "preferences.window.disable-screen-saver.placeholder": "Disable computer screensaver", + "preferences.window.size.width": "Window Width", + "preferences.window.size.width.placeholder": "Device Width", + "preferences.window.size.width.tips": "Note: Changing this setting may result in blurry display.", + "preferences.window.size.height": "Window Height", + "preferences.window.size.height.placeholder": "Device Height", + "preferences.window.size.height.tips": "Note: Changing this setting may result in blurry display.", + "preferences.window.position.x": "Window X Position", + "preferences.window.position.x.placeholder": "Relative to Desktop Center", + "preferences.window.position.y": "Window Y Position", + "preferences.window.position.y.placeholder": "Relative to Desktop Center", "preferences.record.name": "Recording", "preferences.record.format.name": "Format", diff --git a/src/locales/languages/zh_CN.json b/src/locales/languages/zh_CN.json index 6b950065..8c2e68bc 100644 --- a/src/locales/languages/zh_CN.json +++ b/src/locales/languages/zh_CN.json @@ -229,6 +229,16 @@ "preferences.window.always-top.placeholder": "开启后控制窗口将始终位于顶部", "preferences.window.disable-screen-saver.name": "禁用屏幕保护程序", "preferences.window.disable-screen-saver.placeholder": "开启后将禁用计算机屏幕保护程序", + "preferences.window.size.width": "窗口宽度", + "preferences.window.size.width.placeholder": "设备宽度", + "preferences.window.size.width.tips": "注意:更改此设置可能会导致显示模糊", + "preferences.window.size.height": "窗口高度", + "preferences.window.size.height.placeholder": "设备高度", + "preferences.window.size.height.tips": "注意:更改此设置可能会导致显示模糊", + "preferences.window.position.x": "窗口横坐标", + "preferences.window.position.x.placeholder": "相对于桌面中心", + "preferences.window.position.y": "窗口纵坐标", + "preferences.window.position.y.placeholder": "相对于桌面中心", "preferences.record.name": "音视频录制", "preferences.record.format.name": "录制视频格式", diff --git a/src/store/preference/index.js b/src/store/preference/index.js index fce851a4..c1dd16c4 100644 --- a/src/store/preference/index.js +++ b/src/store/preference/index.js @@ -70,7 +70,10 @@ export const usePreferenceStore = defineStore({ this.init() }, setData(data, scope = this.deviceScope) { - const pickData = pickBy(data, value => !!value) + const pickData = pickBy( + data, + value => !!value || typeof value === 'number', + ) if (data.adbPath === adbPath) { delete pickData.adbPath @@ -136,7 +139,7 @@ export const usePreferenceStore = defineStore({ } const valueList = Object.entries(data).reduce((arr, [key, value]) => { - if (!value) { + if (!value && typeof value !== 'number') { return arr } diff --git a/src/store/preference/model/window/index.js b/src/store/preference/model/window/index.js index 1957b14c..ef8a705b 100644 --- a/src/store/preference/model/window/index.js +++ b/src/store/preference/model/window/index.js @@ -3,6 +3,36 @@ export default { field: 'scrcpy', children: { + windowWidth: { + label: 'preferences.window.size.width', + field: '--window-width', + type: 'Input.number', + value: undefined, + placeholder: 'preferences.window.size.width.placeholder', + tips: 'preferences.window.size.width.tips', + }, + windowHeight: { + label: 'preferences.window.size.height', + field: '--window-height', + type: 'Input.number', + value: undefined, + placeholder: 'preferences.window.size.height.placeholder', + tips: 'preferences.window.size.height.tips', + }, + windowX: { + label: 'preferences.window.position.x', + field: '--window-x', + type: 'Input.number', + value: undefined, + placeholder: 'preferences.window.position.x.placeholder', + }, + windowY: { + label: 'preferences.window.position.y', + field: '--window-y', + type: 'Input.number', + value: undefined, + placeholder: 'preferences.window.position.y.placeholder', + }, windowBorderless: { label: 'preferences.window.borderless.name', field: '--window-borderless',