File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -97,24 +97,14 @@ CParameterDlgSettings::~CParameterDlgSettings()
9797
9898void CParameterDlgSettings::AddViewers (const QList<QWidget *> &wViewer)
9999{
100- int nWidth = 0 ;
101- int nHeigth = 0 ;
102- foreach (auto p, wViewer) {
103- if (!p) continue ;
104- nWidth = qMax (nWidth, p->frameSize ().width ());
105- nHeigth = qMax (nHeigth, p->frameSize ().height ());
106- }
107- bool bScroll = false ;
108- QScreen* pScreen = QApplication::primaryScreen ();
109- QSize size = this ->size ();
110- if (nWidth > size.width () || nHeigth > size.height ())
111- bScroll = true ;
112100 // [connect accepted to slotAccept of widget]
113101 foreach (auto p, wViewer)
114102 {
115103 QString szMsg;
116104 QWidget* pView = p;
117- if (bScroll)
105+ QSize size = this ->size ();
106+ if (p->frameSize ().width () > size.width ()
107+ || p->frameSize ().height () > size.height ())
118108 {
119109 QScrollArea* pScroll = new QScrollArea (ui->tabWidget );
120110 if (!pScroll) continue ;
Original file line number Diff line number Diff line change @@ -97,7 +97,7 @@ int main(int argc, char *argv[])
9797
9898 // qputenv("QT_MEDIA_BACKEND", "ffmpeg");
9999
100- // * // TODO: Wayland下设置中的音频设置窗口有问题
100+ // * // TODO: Wayland下视频(QVideoWidget*)覆盖全屏工具条
101101#if (defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) \
102102 && (QT_VERSION >= QT_VERSION_CHECK (6 , 0 , 0 )))
103103 // https://doc.qt.io/qt-6/zh/wayland-and-qt.html
You can’t perform that action at this time.
0 commit comments