Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
a9746026
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,发现更多精彩内容 >>
提交
a9746026
编写于
8月 11, 2016
作者:
J
Jim
提交者:
GitHub
8月 11, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #591 from reboot/improve_save_and_restore_of_window_geometry
UI: Improve saving and restoring geometry of main window
上级
83a042f9
3ad35625
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
12 addition
and
21 deletion
+12
-21
obs/window-basic-main.cpp
obs/window-basic-main.cpp
+12
-21
未找到文件。
obs/window-basic-main.cpp
浏览文件 @
a9746026
...
@@ -127,25 +127,22 @@ OBSBasic::OBSBasic(QWidget *parent)
...
@@ -127,25 +127,22 @@ OBSBasic::OBSBasic(QWidget *parent)
ui
->
sources
->
setItemDelegate
(
new
VisibilityItemDelegate
(
ui
->
sources
));
ui
->
sources
->
setItemDelegate
(
new
VisibilityItemDelegate
(
ui
->
sources
));
int
width
=
config_get_int
(
App
()
->
GlobalConfig
(),
"BasicWindow"
,
"cx"
);
const
char
*
geometry
=
config_get_string
(
App
()
->
GlobalConfig
(),
"BasicWindow"
,
"geometry"
);
// Check if no values are saved (new installation).
if
(
geometry
!=
NULL
)
{
if
(
width
!=
0
)
{
QByteArray
byteArray
=
QByteArray
::
fromBase64
(
int
height
=
config_get_int
(
App
()
->
GlobalConfig
(),
QByteArray
(
geometry
));
"BasicWindow"
,
"cy"
);
restoreGeometry
(
byteArray
);
int
posx
=
config_get_int
(
App
()
->
GlobalConfig
(),
"BasicWindow"
,
"posx"
);
QRect
windowGeometry
=
normalGeometry
();
int
posy
=
config_get_int
(
App
()
->
GlobalConfig
(),
"BasicWindow"
,
int
posx
=
windowGeometry
.
x
();
"posy"
);
int
posy
=
windowGeometry
.
y
();
if
(
!
WindowPositionValid
(
posx
,
posy
))
{
if
(
!
WindowPositionValid
(
posx
,
posy
))
{
QRect
rect
=
App
()
->
desktop
()
->
availableGeometry
();
QRect
rect
=
App
()
->
desktop
()
->
availableGeometry
();
setGeometry
(
QStyle
::
alignedRect
(
setGeometry
(
QStyle
::
alignedRect
(
Qt
::
LeftToRight
,
Qt
::
LeftToRight
,
Qt
::
AlignCenter
,
Qt
::
AlignCenter
,
size
(),
rect
));
size
(),
rect
));
}
else
{
setGeometry
(
posx
,
posy
,
width
,
height
);
}
}
}
}
...
@@ -1450,14 +1447,8 @@ OBSBasic::~OBSBasic()
...
@@ -1450,14 +1447,8 @@ OBSBasic::~OBSBasic()
QList
<
int
>
splitterSizes
=
ui
->
mainSplitter
->
sizes
();
QList
<
int
>
splitterSizes
=
ui
->
mainSplitter
->
sizes
();
bool
alwaysOnTop
=
IsAlwaysOnTop
(
this
);
bool
alwaysOnTop
=
IsAlwaysOnTop
(
this
);
config_set_int
(
App
()
->
GlobalConfig
(),
"BasicWindow"
,
"cx"
,
config_set_string
(
App
()
->
GlobalConfig
(),
"BasicWindow"
,
"geometry"
,
lastGeom
.
width
());
saveGeometry
().
toBase64
().
constData
());
config_set_int
(
App
()
->
GlobalConfig
(),
"BasicWindow"
,
"cy"
,
lastGeom
.
height
());
config_set_int
(
App
()
->
GlobalConfig
(),
"BasicWindow"
,
"posx"
,
lastGeom
.
x
());
config_set_int
(
App
()
->
GlobalConfig
(),
"BasicWindow"
,
"posy"
,
lastGeom
.
y
());
config_set_int
(
App
()
->
GlobalConfig
(),
"BasicWindow"
,
"splitterTop"
,
config_set_int
(
App
()
->
GlobalConfig
(),
"BasicWindow"
,
"splitterTop"
,
splitterSizes
[
0
]);
splitterSizes
[
0
]);
config_set_int
(
App
()
->
GlobalConfig
(),
"BasicWindow"
,
"splitterBottom"
,
config_set_int
(
App
()
->
GlobalConfig
(),
"BasicWindow"
,
"splitterBottom"
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录