Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
7f910909
O
obs-studio
项目概览
尘离序散
/
obs-studio
与 Fork 源项目一致
从无法访问的项目Fork
通知
30
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
obs-studio
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7f910909
编写于
8月 29, 2018
作者:
C
cg2121
提交者:
Clayton Groeneveld
9月 18, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
UI: Add ability to resize output based on source size
上级
14ae6351
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
55 addition
and
0 deletion
+55
-0
UI/data/locale/en-US.ini
UI/data/locale/en-US.ini
+5
-0
UI/window-basic-main.cpp
UI/window-basic-main.cpp
+48
-0
UI/window-basic-main.hpp
UI/window-basic-main.hpp
+2
-0
未找到文件。
UI/data/locale/en-US.ini
浏览文件 @
7f910909
...
@@ -865,3 +865,8 @@ About.GetInvolved="Get Involved"
...
@@ -865,3 +865,8 @@ About.GetInvolved="Get Involved"
About.Authors
=
"Authors"
About.Authors
=
"Authors"
About.License
=
"License"
About.License
=
"License"
About.Contribute
=
"Want to contribute?"
About.Contribute
=
"Want to contribute?"
# Dynamic output size
ResizeOutputSizeOfSource
=
"Resize output (source size)"
ResizeOutputSizeOfSource.Text
=
"The base and canvas resolution will be resized to the size of the current source."
ResizeOutputSizeOfSource.Continue
=
"Do you want to continue?"
UI/window-basic-main.cpp
浏览文件 @
7f910909
...
@@ -4227,6 +4227,21 @@ void OBSBasic::CreateSourcePopupMenu(int idx, bool preview)
...
@@ -4227,6 +4227,21 @@ void OBSBasic::CreateSourcePopupMenu(int idx, bool preview)
popup
.
addSeparator
();
popup
.
addSeparator
();
}
}
QAction
*
resizeOutput
=
popup
.
addAction
(
QTStr
(
"ResizeOutputSizeOfSource"
),
this
,
SLOT
(
ResizeOutputSizeOfSource
()));
int
width
=
obs_source_get_width
(
source
);
int
height
=
obs_source_get_height
(
source
);
resizeOutput
->
setEnabled
(
!
(
ui
->
streamButton
->
isChecked
()
||
ui
->
recordButton
->
isChecked
()
||
(
replayBufferButton
&&
replayBufferButton
->
isChecked
())));
if
(
width
==
0
||
height
==
0
)
resizeOutput
->
setEnabled
(
false
);
popup
.
addMenu
(
AddScaleFilteringMenu
(
sceneItem
));
popup
.
addMenu
(
AddScaleFilteringMenu
(
sceneItem
));
popup
.
addSeparator
();
popup
.
addSeparator
();
...
@@ -6733,6 +6748,39 @@ void OBSBasic::on_actionShowAbout_triggered()
...
@@ -6733,6 +6748,39 @@ void OBSBasic::on_actionShowAbout_triggered()
about
->
setAttribute
(
Qt
::
WA_DeleteOnClose
,
true
);
about
->
setAttribute
(
Qt
::
WA_DeleteOnClose
,
true
);
}
}
void
OBSBasic
::
ResizeOutputSizeOfSource
()
{
if
(
ui
->
streamButton
->
isChecked
()
||
ui
->
recordButton
->
isChecked
()
||
(
replayBufferButton
&&
replayBufferButton
->
isChecked
()))
return
;
QMessageBox
resize_output
(
this
);
resize_output
.
setText
(
QTStr
(
"ResizeOutputSizeOfSource.Text"
)
+
"
\n\n
"
+
QTStr
(
"ResizeOutputSizeOfSource.Continue"
));
QAbstractButton
*
Yes
=
resize_output
.
addButton
(
QTStr
(
"Yes"
),
QMessageBox
::
YesRole
);
resize_output
.
addButton
(
QTStr
(
"No"
),
QMessageBox
::
NoRole
);
resize_output
.
setIcon
(
QMessageBox
::
Warning
);
resize_output
.
setWindowTitle
(
QTStr
(
"ResizeOutputSizeOfSource"
));
resize_output
.
exec
();
if
(
resize_output
.
clickedButton
()
!=
Yes
)
return
;
OBSSource
source
=
obs_sceneitem_get_source
(
GetCurrentSceneItem
());
int
width
=
obs_source_get_width
(
source
);
int
height
=
obs_source_get_height
(
source
);
config_set_uint
(
basicConfig
,
"Video"
,
"BaseCX"
,
width
);
config_set_uint
(
basicConfig
,
"Video"
,
"BaseCY"
,
height
);
config_set_uint
(
basicConfig
,
"Video"
,
"OutputCX"
,
width
);
config_set_uint
(
basicConfig
,
"Video"
,
"OutputCY"
,
height
);
ResetVideo
();
on_actionFitToScreen_triggered
();
}
ColorSelect
::
ColorSelect
(
QWidget
*
parent
)
ColorSelect
::
ColorSelect
(
QWidget
*
parent
)
:
QWidget
(
parent
),
:
QWidget
(
parent
),
ui
(
new
Ui
::
ColorSelect
)
ui
(
new
Ui
::
ColorSelect
)
...
...
UI/window-basic-main.hpp
浏览文件 @
7f910909
...
@@ -742,6 +742,8 @@ private slots:
...
@@ -742,6 +742,8 @@ private slots:
void
StackedMixerAreaContextMenuRequested
();
void
StackedMixerAreaContextMenuRequested
();
void
ResizeOutputSizeOfSource
();
public
slots
:
public
slots
:
void
on_actionResetTransform_triggered
();
void
on_actionResetTransform_triggered
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录