lingling
/
media_player_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'blending' of http://www.cloudview.work/git/fangxiang/media_player_client into blending

This commit is contained in:
shefengchun 2023-02-03 09:30:49 +08:00
parent 1e19299d1f e388f61a9c
commit e11b1fbc32
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/FusionSettings/GridSettings.vue
View File

@ -166,8 +166,8 @@ export default defineComponent({
} }
const use_server_config = () => { const use_server_config = () => {
let server_conf = JSON.parse($store.state.fusion_configuration).options let server_conf = JSON.parse($store.state.fusion_configuration).options
model[0] = Number(server_conf.blending_grids_row) model[0] = server_conf.blending_grids_row ? Number(server_conf.blending_grids_row) : 20;
model[1] = Number(server_conf.blending_grids_column) model[1] = server_conf.blending_grids_column ? Number(server_conf.blending_grids_column) : 40;
color[0] = server_conf.blending_grids_line_color color[0] = server_conf.blending_grids_line_color
RowsColumns[0] = server_conf.blending_grids_show_row === "false" ? false : true RowsColumns[0] = server_conf.blending_grids_show_row === "false" ? false : true

2
src/i18n/en-US/index.ts
View File

@ -444,6 +444,6 @@ export default {
"debugging":"debugging", "debugging":"debugging",
"disable_blending":"disable blending", "disable_blending":"disable blending",
"disable_clip":"disable clip", "disable_clip":"disable clip",
"show_mask":"show desktop", "show_mask":"hide desktop",
"save_bmp":"save bmp" "save_bmp":"save bmp"
}; };

2
src/i18n/zh-CN/index.ts
View File

@ -713,6 +713,6 @@ export default {
"debugging":"调试", "debugging":"调试",
"disable_blending":"禁用混合", "disable_blending":"禁用混合",
"disable_clip":"禁用裁剪", "disable_clip":"禁用裁剪",
"show_mask":"显示桌面", "show_mask":"隐藏桌面",
"save_bmp":"保存BMP" "save_bmp":"保存BMP"
}; };