diff options
Diffstat (limited to 'src/plugins/qmldesigner/components')
6 files changed, 2 insertions, 260 deletions
diff --git a/src/plugins/qmldesigner/components/formeditor/editview3dproxydialog.cpp b/src/plugins/qmldesigner/components/formeditor/editview3dproxydialog.cpp deleted file mode 100644 index 505eeacd1f..0000000000 --- a/src/plugins/qmldesigner/components/formeditor/editview3dproxydialog.cpp +++ /dev/null @@ -1,168 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#include "editview3dproxydialog.h" -#include "formeditorview.h" - -#include <nodeinstanceview.h> - -#include <coreplugin/icore.h> - -#include <utils/hostosinfo.h> - -#include <QApplication> -#include <QMouseEvent> -#include <QStyle> -#include <QWindow> - -namespace QmlDesigner { - -const int borderOffset = 8; - -static int titleBarHeight() { - return QApplication::style()->pixelMetric(QStyle::PM_TitleBarHeight); -} - -EditView3DProxyDialog::EditView3DProxyDialog(FormEditorView *view) : - QDialog(Core::ICore::dialogParent()) - ,m_formEditorView(view) -{ - setFocusPolicy(Qt::ClickFocus); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - - if (Utils::HostOsInfo::isMacHost()) { - setWindowFlag(Qt::Tool); - setAttribute(Qt::WA_MacAlwaysShowToolWindow); - } - - resize(1024, 768); -} - -void EditView3DProxyDialog::invalidate() -{ - if (nodeInstanceView() && isVisible()) - nodeInstanceView()->show3DView(adjustedRect()); -} - -void EditView3DProxyDialog::moveEvent(QMoveEvent *event) -{ - if (nodeInstanceView()) - nodeInstanceView()->move3DView(pos() + QPoint(borderOffset, titleBarHeight() + 2 * borderOffset)); - - QDialog::moveEvent(event); -} - -void EditView3DProxyDialog::closeEvent(QCloseEvent *event) -{ - if (m_formEditorView) { - m_formEditorView->toggle3DViewEnabled(false); - m_formEditorView->setupOption3DAction(); - } - - nodeInstanceView()->hide3DView(); - - QDialog::closeEvent(event); -} - -void EditView3DProxyDialog::hideEvent(QHideEvent *event) -{ - if (m_formEditorView) { - m_formEditorView->toggle3DViewEnabled(false); - m_formEditorView->setupOption3DAction(); - } - - nodeInstanceView()->hide3DView(); - - QDialog::hideEvent(event); -} - -void EditView3DProxyDialog::focusOutEvent(QFocusEvent *event) -{ - if (isVisible()) - showView(); - - QDialog::focusOutEvent(event); -} - -void EditView3DProxyDialog::focusInEvent(QFocusEvent *event) -{ - showView(); - - QDialog::focusInEvent(event); -} - -void EditView3DProxyDialog::resizeEvent(QResizeEvent *event) -{ - if (nodeInstanceView()) - nodeInstanceView()->show3DView(adjustedRect()); - - QDialog::resizeEvent(event); -} - -bool EditView3DProxyDialog::event(QEvent *event) -{ - if (event->type() == QEvent::WindowActivate) { - showView(); - } else if (event->type() == QEvent::NonClientAreaMouseButtonPress) { - auto mouseMoveEvent = static_cast<QMouseEvent *>(event); - if (mouseMoveEvent->buttons() & Qt::LeftButton) - hideView(); - } else if (event->type() == QEvent::NonClientAreaMouseButtonRelease) { - auto mouseMoveEvent = static_cast<QMouseEvent *>(event); - if (mouseMoveEvent->buttons() & Qt::LeftButton) - showView(); - } - - return QDialog::event(event); -} - -QRect EditView3DProxyDialog::adjustedRect() const -{ - return QRect(pos(), size()).adjusted(borderOffset, - titleBarHeight() + 2 * borderOffset, - -borderOffset, titleBarHeight()); -} - -NodeInstanceView *EditView3DProxyDialog::nodeInstanceView() const -{ - if (m_formEditorView) - return m_formEditorView->nodeInstanceView(); - - return nullptr; -} - -void EditView3DProxyDialog::showView() -{ - if (nodeInstanceView()) - nodeInstanceView()->show3DView(adjustedRect()); -} - -void EditView3DProxyDialog::hideView() -{ - if (nodeInstanceView()) - nodeInstanceView()->hide3DView(); -} - -} //QmlDesigner diff --git a/src/plugins/qmldesigner/components/formeditor/editview3dproxydialog.h b/src/plugins/qmldesigner/components/formeditor/editview3dproxydialog.h deleted file mode 100644 index 717deca7f9..0000000000 --- a/src/plugins/qmldesigner/components/formeditor/editview3dproxydialog.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#pragma once - -#include "abstractcustomtool.h" - -#include <QObject> -#include <QDialog> - -namespace QmlDesigner { - -class FormEditorView; -class NodeInstanceView; - -class EditView3DProxyDialog : public QDialog -{ - Q_OBJECT - -public: - explicit EditView3DProxyDialog(FormEditorView *view); - - void invalidate(); - -protected: - void moveEvent(QMoveEvent *event) override; - void closeEvent(QCloseEvent *event) override; - void hideEvent(QHideEvent *event) override; - void focusOutEvent(QFocusEvent *event) override; - void focusInEvent(QFocusEvent *event) override; - void resizeEvent(QResizeEvent *event) override; - bool event(QEvent *event) override; - -private: - QRect adjustedRect() const; - NodeInstanceView *nodeInstanceView() const; - void showView(); - void hideView(); - - QPointer<FormEditorView> m_formEditorView; - -}; - -} //QmlDesigner - diff --git a/src/plugins/qmldesigner/components/formeditor/formeditor.pri b/src/plugins/qmldesigner/components/formeditor/formeditor.pri index 15de28f504..5bff19e664 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditor.pri +++ b/src/plugins/qmldesigner/components/formeditor/formeditor.pri @@ -1,6 +1,5 @@ VPATH += $$PWD SOURCES += formeditoritem.cpp \ - editview3dproxydialog.cpp \ formeditorview.cpp \ formeditorscene.cpp \ formeditorwidget.cpp \ @@ -41,7 +40,6 @@ SOURCES += formeditoritem.cpp \ option3daction.cpp HEADERS += formeditorscene.h \ - editview3dproxydialog.h \ formeditorwidget.h \ formeditoritem.h \ formeditorview.h \ diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp index 90707a5887..ee7b3f18a9 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp @@ -24,6 +24,7 @@ ****************************************************************************/ #include "formeditorview.h" +#include "nodeinstanceview.h" #include "selectiontool.h" #include "movetool.h" #include "option3daction.h" @@ -475,8 +476,6 @@ void FormEditorView::instancesCompleted(const QVector<ModelNode> &completedNodeL itemNodeList.append(item); } } - if (node.isRootNode()) - formEditorWidget()->invalidate3DEditor(); } currentTool()->instancesCompleted(itemNodeList); } @@ -598,7 +597,7 @@ void FormEditorView::toggle3DViewEnabled(bool enabled) else rootModelNode().setAuxiliaryData("3d-view", false); - formEditorWidget()->set3dEditorVisibility(enabled); + nodeInstanceView()->enable3DView(enabled); } QmlItemNode findRecursiveQmlItemNode(const QmlObjectNode &firstQmlObjectNode) diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp index fdad23a880..f5970dc0e0 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp @@ -24,7 +24,6 @@ ****************************************************************************/ #include "designeractionmanager.h" -#include "editview3dproxydialog.h" #include "formeditorwidget.h" #include "formeditorscene.h" #include "qmldesignerplugin.h" @@ -174,14 +173,11 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view) : fillLayout->addWidget(m_graphicsView.data()); m_graphicsView.data()->setStyleSheet(Theme::replaceCssColors(QString::fromUtf8(Utils::FileReader::fetchQrc(QLatin1String(":/qmldesigner/scrollbar.css"))))); - - m_editView3DProxyDialog = new EditView3DProxyDialog(view); } void FormEditorWidget::changeTransformTool(bool checked) { if (checked) - m_formEditorView->changeToTransformTools(); } @@ -397,17 +393,6 @@ FormEditorGraphicsView *FormEditorWidget::graphicsView() const return m_graphicsView; } -void FormEditorWidget::set3dEditorVisibility(bool b) -{ - m_editView3DProxyDialog->setVisible(b); -} - -void FormEditorWidget::invalidate3DEditor() -{ - if (m_editView3DProxyDialog) - m_editView3DProxyDialog->invalidate(); -} - DocumentWarningWidget *FormEditorWidget::errorWidget() { if (m_documentErrorWidget.isNull()) { diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.h b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.h index d1c5588528..f7e0d8a92d 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.h +++ b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.h @@ -37,7 +37,6 @@ QT_END_NAMESPACE namespace QmlDesigner { -class EditView3DProxyDialog; class ZoomAction; class LineEditAction; class BackgroundAction; @@ -87,9 +86,6 @@ public: FormEditorGraphicsView *graphicsView() const; - void set3dEditorVisibility(bool b); - void invalidate3DEditor(); - protected: void wheelEvent(QWheelEvent *event) override; QActionGroup *toolActionGroup() const; @@ -120,7 +116,6 @@ private: QPointer<Option3DAction> m_option3DAction; QPointer<QAction> m_resetAction; QPointer<DocumentWarningWidget> m_documentErrorWidget; - QPointer<EditView3DProxyDialog> m_editView3DProxyDialog; }; } // namespace QmlDesigner |