1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00

Merge branch 4.x

This commit is contained in:
Alexander Smorkalov
2025-05-27 16:48:22 +03:00
167 changed files with 7028 additions and 4687 deletions
+5 -3
View File
@@ -1649,16 +1649,18 @@ CvWindow::CvWindow(QString name, int arg2)
createStatusBar();
}
myView->getWidget()->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
//Now attach everything
if (myToolBar)
myGlobalLayout->addWidget(myToolBar, 0, Qt::AlignLeft);
myGlobalLayout->addWidget(myToolBar);
myGlobalLayout->addWidget(myView->getWidget(), 0, Qt::AlignCenter);
myGlobalLayout->addWidget(myView->getWidget());
myGlobalLayout->addLayout(myBarLayout);
if (myStatusBar)
myGlobalLayout->addWidget(myStatusBar, 0, Qt::AlignLeft);
myGlobalLayout->addWidget(myStatusBar);
setLayout(myGlobalLayout);
show();