feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Inline TransitionContext

Browse Source 
Change-Id: I2f6d101a7d7ae06f11b780ea754e1b4ce6028b4c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2024-07-05 15:45:44 +02:00
parent 63bb621694
commit df658d1a96
3 changed files with 6 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmldesigner/components/transitioneditor/transitioneditorview.cpp
View File

@@ -316,13 +316,9 @@ ModelNode TransitionEditorView::addNewTransition()
TransitionEditorWidget *TransitionEditorView::createWidget() TransitionEditorWidget *TransitionEditorView::createWidget()
{ {
if (!m_transitionEditorWidget) { if (!m_transitionEditorWidget)
m_transitionEditorWidget = new TransitionEditorWidget(this); m_transitionEditorWidget = new TransitionEditorWidget(this);
auto *transitionContext = new TransitionContext(m_transitionEditorWidget);
Core::ICore::addContextObject(transitionContext);
}
return m_transitionEditorWidget; return m_transitionEditorWidget;
} }

16
src/plugins/qmldesigner/components/transitioneditor/transitioneditorwidget.cpp
View File

@@ -45,18 +45,9 @@
#include <cmath> #include <cmath>
namespace QmlDesigner { using namespace Core;
TransitionContext::TransitionContext(QWidget *widget) namespace QmlDesigner {
: IContext(widget)
{
setWidget(widget);
setContext(Core::Context(TransitionEditorConstants::C_QMLTRANSITIONS));
setContextHelpProvider([this](const Core::IContext::HelpCallback &callback) {
if (auto *widget = qobject_cast<TransitionEditorWidget *>(m_widget))
widget->contextHelp(callback);
});
}
class Eventfilter : public QObject class Eventfilter : public QObject
{ {
@@ -221,6 +212,9 @@ TransitionEditorWidget::TransitionEditorWidget(TransitionEditorView *view)
m_toolbar->setScaleFactor(scaleFactor); m_toolbar->setScaleFactor(scaleFactor);
}); });
m_graphicsView->viewport()->installEventFilter(filter); m_graphicsView->viewport()->installEventFilter(filter);
IContext::attach(this, Context(TransitionEditorConstants::C_QMLTRANSITIONS),
[this](const IContext::HelpCallback &callback) { contextHelp(callback); });
} }
void TransitionEditorWidget::setTransitionActive(bool b) void TransitionEditorWidget::setTransitionActive(bool b)

10
src/plugins/qmldesigner/components/transitioneditor/transitioneditorwidget.h
View File

@@ -11,8 +11,6 @@
#include <QWidget> #include <QWidget>
#include <functional>
QT_FORWARD_DECLARE_CLASS(QComboBox) QT_FORWARD_DECLARE_CLASS(QComboBox)
QT_FORWARD_DECLARE_CLASS(QGraphicsView) QT_FORWARD_DECLARE_CLASS(QGraphicsView)
QT_FORWARD_DECLARE_CLASS(QLabel) QT_FORWARD_DECLARE_CLASS(QLabel)
@@ -29,14 +27,6 @@ class TransitionEditorToolBar;
class TransitionEditorGraphicsScene; class TransitionEditorGraphicsScene;
class ModelNode; class ModelNode;
class TransitionContext : public Core::IContext
{
Q_OBJECT
public:
explicit TransitionContext(QWidget *widget);
};
class TransitionEditorWidget : public QWidget class TransitionEditorWidget : public QWidget
{ {
Q_OBJECT Q_OBJECT