mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-07-10 11:58:47 +02:00
fix memory leak
This commit is contained in:
parent
c18aeef6b3
commit
8b57b3c0ff
2 changed files with 11 additions and 3 deletions
|
@ -52,6 +52,9 @@ WebWindowClass::WebWindowClass(const QString& title, const QString& url, int wid
|
||||||
|
|
||||||
dockWidget->setWidget(_webView);
|
dockWidget->setWidget(_webView);
|
||||||
|
|
||||||
|
auto titleWidget = new QWidget();
|
||||||
|
dockWidget->setTitleBarWidget(titleWidget);
|
||||||
|
|
||||||
toolWindow->addDockWidget(Qt::TopDockWidgetArea, dockWidget, Qt::Horizontal);
|
toolWindow->addDockWidget(Qt::TopDockWidgetArea, dockWidget, Qt::Horizontal);
|
||||||
|
|
||||||
_windowWidget = dockWidget;
|
_windowWidget = dockWidget;
|
||||||
|
|
|
@ -33,16 +33,22 @@ ToolWindow::ToolWindow(QWidget* parent) :
|
||||||
bool ToolWindow::event(QEvent* event) {
|
bool ToolWindow::event(QEvent* event) {
|
||||||
QEvent::Type type = event->type();
|
QEvent::Type type = event->type();
|
||||||
if (type == QEvent::Show) {
|
if (type == QEvent::Show) {
|
||||||
|
|
||||||
if (!_hasShown) {
|
if (!_hasShown) {
|
||||||
_hasShown = true;
|
_hasShown = true;
|
||||||
|
|
||||||
QMainWindow* mainWindow = qApp->getWindow();
|
QMainWindow* mainWindow = qApp->getWindow();
|
||||||
QRect mainGeometry = mainWindow->geometry();
|
QRect mainGeometry = mainWindow->geometry();
|
||||||
|
|
||||||
_lastGeometry = QRect(mainGeometry.topLeft().x(), mainGeometry.topLeft().y(),
|
int titleBarHeight = UIUtil::getWindowTitleBarHeight(this);
|
||||||
DEFAULT_WIDTH, mainGeometry.height());
|
int topMargin = titleBarHeight;
|
||||||
|
|
||||||
|
_lastGeometry = QRect(mainGeometry.topLeft().x(), mainGeometry.topLeft().y() + topMargin,
|
||||||
|
DEFAULT_WIDTH, mainGeometry.height() - topMargin);
|
||||||
}
|
}
|
||||||
|
|
||||||
setGeometry(_lastGeometry);
|
setGeometry(_lastGeometry);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
} else if (type == QEvent::Hide) {
|
} else if (type == QEvent::Hide) {
|
||||||
_lastGeometry = geometry();
|
_lastGeometry = geometry();
|
||||||
|
@ -125,7 +131,6 @@ void ToolWindow::addDockWidget(Qt::DockWidgetArea area, QDockWidget* dockWidget,
|
||||||
|
|
||||||
QDockWidget* lastDockWidget = dockWidget;
|
QDockWidget* lastDockWidget = dockWidget;
|
||||||
|
|
||||||
lastDockWidget->setTitleBarWidget(new QWidget());
|
|
||||||
|
|
||||||
foreach(QDockWidget* nextDockWidget, dockWidgets) {
|
foreach(QDockWidget* nextDockWidget, dockWidgets) {
|
||||||
tabifyDockWidget(lastDockWidget, nextDockWidget);
|
tabifyDockWidget(lastDockWidget, nextDockWidget);
|
||||||
|
|
Loading…
Reference in a new issue