|
|
|
@ -155,7 +155,7 @@ void VideoForm::updateShowSize(const QSize &newSize)
|
|
|
|
if (isFullScreen()) {
|
|
|
|
if (isFullScreen()) {
|
|
|
|
switchFullScreen();
|
|
|
|
switchFullScreen();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (layout()) {
|
|
|
|
if (m_skin) {
|
|
|
|
QMargins m = getMargins(vertical);
|
|
|
|
QMargins m = getMargins(vertical);
|
|
|
|
showSize.setWidth(showSize.width() + m.left() + m.right());
|
|
|
|
showSize.setWidth(showSize.width() + m.left() + m.right());
|
|
|
|
showSize.setHeight(showSize.height() + m.top() + m.bottom());
|
|
|
|
showSize.setHeight(showSize.height() + m.top() + m.bottom());
|
|
|
|
@ -165,9 +165,11 @@ void VideoForm::updateShowSize(const QSize &newSize)
|
|
|
|
move(screenRect.center() - QRect(0, 0, showSize.width(), showSize.height()).center());
|
|
|
|
move(screenRect.center() - QRect(0, 0, showSize.width(), showSize.height()).center());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// 减去标题栏高度 (mark:已经没有标题栏了)
|
|
|
|
if (!m_skin) {
|
|
|
|
//int titleBarHeight = style()->pixelMetric(QStyle::PM_TitleBarHeight);
|
|
|
|
// 减去标题栏高度 (mark:已经没有标题栏了)
|
|
|
|
//showSize.setHeight(showSize.height() - titleBarHeight);
|
|
|
|
int titleBarHeight = style()->pixelMetric(QStyle::PM_TitleBarHeight);
|
|
|
|
|
|
|
|
showSize.setHeight(showSize.height() - titleBarHeight);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (showSize != size()) {
|
|
|
|
if (showSize != size()) {
|
|
|
|
#ifdef Q_OS_OSX
|
|
|
|
#ifdef Q_OS_OSX
|
|
|
|
|