- Shorten menu code, add keyboard shortcuts and a quit action. - Avoid calls to setLayout(). - Pass a parent to message boxes. - Use the current screen for size calculation and consider availableGeometry(). - Prevent closing by the Escape key in docked mode. - Split the dockUndock() function into dock()/undock() for clarity Change-Id: I007da3bff86ee3f2dc8f87379e5d2ba2f0f6f3d7 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit 6f8398c8eb5476a6e98126d5b63421896b874271) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 734db610c3db3f00775d518b63d94695a2654389)
105 lines
2.9 KiB
C++
105 lines
2.9 KiB
C++
// Copyright (C) 2016 The Qt Company Ltd.
|
|
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
|
|
|
|
#include "glwidget.h"
|
|
#include "window.h"
|
|
#include "mainwindow.h"
|
|
#include <QSlider>
|
|
#include <QVBoxLayout>
|
|
#include <QHBoxLayout>
|
|
#include <QKeyEvent>
|
|
#include <QPushButton>
|
|
#include <QApplication>
|
|
#include <QMessageBox>
|
|
|
|
Window::Window(MainWindow *mw)
|
|
: mainWindow(mw)
|
|
{
|
|
glWidget = new GLWidget;
|
|
|
|
xSlider = createSlider();
|
|
ySlider = createSlider();
|
|
zSlider = createSlider();
|
|
|
|
connect(xSlider, &QSlider::valueChanged, glWidget, &GLWidget::setXRotation);
|
|
connect(glWidget, &GLWidget::xRotationChanged, xSlider, &QSlider::setValue);
|
|
connect(ySlider, &QSlider::valueChanged, glWidget, &GLWidget::setYRotation);
|
|
connect(glWidget, &GLWidget::yRotationChanged, ySlider, &QSlider::setValue);
|
|
connect(zSlider, &QSlider::valueChanged, glWidget, &GLWidget::setZRotation);
|
|
connect(glWidget, &GLWidget::zRotationChanged, zSlider, &QSlider::setValue);
|
|
|
|
QVBoxLayout *mainLayout = new QVBoxLayout(this);
|
|
QWidget *w = new QWidget;
|
|
QHBoxLayout *container = new QHBoxLayout(w);
|
|
container->addWidget(glWidget);
|
|
container->addWidget(xSlider);
|
|
container->addWidget(ySlider);
|
|
container->addWidget(zSlider);
|
|
|
|
mainLayout->addWidget(w);
|
|
dockBtn = new QPushButton(tr("Undock"), this);
|
|
connect(dockBtn, &QPushButton::clicked, this, &Window::dockUndock);
|
|
mainLayout->addWidget(dockBtn);
|
|
|
|
xSlider->setValue(15 * 16);
|
|
ySlider->setValue(345 * 16);
|
|
zSlider->setValue(0 * 16);
|
|
|
|
setWindowTitle(tr("Hello GL"));
|
|
}
|
|
|
|
QSlider *Window::createSlider()
|
|
{
|
|
QSlider *slider = new QSlider(Qt::Vertical);
|
|
slider->setRange(0, 360 * 16);
|
|
slider->setSingleStep(16);
|
|
slider->setPageStep(15 * 16);
|
|
slider->setTickInterval(15 * 16);
|
|
slider->setTickPosition(QSlider::TicksRight);
|
|
return slider;
|
|
}
|
|
|
|
void Window::keyPressEvent(QKeyEvent *e)
|
|
{
|
|
if (isWindow() && e->key() == Qt::Key_Escape)
|
|
close();
|
|
else
|
|
QWidget::keyPressEvent(e);
|
|
}
|
|
|
|
void Window::dockUndock()
|
|
{
|
|
if (parent())
|
|
undock();
|
|
else
|
|
dock();
|
|
}
|
|
|
|
void Window::dock()
|
|
{
|
|
if (!mainWindow->isVisible()) {
|
|
QMessageBox::information(this, tr("Cannot Dock"),
|
|
tr("Main window already closed"));
|
|
return;
|
|
}
|
|
if (mainWindow->centralWidget()) {
|
|
QMessageBox::information(this, tr("Cannot Dock"),
|
|
tr("Main window already occupied"));
|
|
return;
|
|
}
|
|
setAttribute(Qt::WA_DeleteOnClose, false);
|
|
dockBtn->setText(tr("Undock"));
|
|
mainWindow->setCentralWidget(this);
|
|
}
|
|
|
|
void Window::undock()
|
|
{
|
|
setParent(nullptr);
|
|
setAttribute(Qt::WA_DeleteOnClose);
|
|
const auto geometry = screen()->availableGeometry();
|
|
move(geometry.x() + (geometry.width() - width()) / 2,
|
|
geometry.y() + (geometry.height() - height()) / 2);
|
|
dockBtn->setText(tr("Dock"));
|
|
show();
|
|
}
|