qtquick: Ported rubberband to the new architecture

This commit is contained in:
Sergio Martins
2022-05-15 14:02:36 +01:00
parent 97faaea983
commit 6b98322d96
4 changed files with 17 additions and 36 deletions

View File

@@ -227,8 +227,8 @@ set(KDDW_QTQUICK_FRONTEND_SRCS
qtquick/views/Frame_qtquick.h
# qtquick/views/MainWindow_qtquick.cpp
# qtquick/views/MainWindow_qtquick.h
# qtquick/views/RubberBand_qtquick.cpp
# qtquick/views/RubberBand_qtquick.h
qtquick/views/RubberBand_qtquick.cpp
qtquick/views/RubberBand_qtquick.h
qtquick/views/Separator_qtquick.cpp
qtquick/views/Separator_qtquick.h
qtquick/views/Stack_qtquick.cpp

View File

@@ -1,22 +0,0 @@
/*
This file is part of KDDockWidgets.
SPDX-FileCopyrightText: 2020-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
Author: Sérgio Martins <sergio.martins@kdab.com>
SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
Contact KDAB at <info@kdab.com> for commercial licensing options.
*/
#include "Rubberband_quick.h"
using namespace Layouting;
RubberBand::RubberBand(Layouting::Widget *parent)
: QQuickItem(parent ? qobject_cast<QQuickItem *>(parent->asQObject()) : nullptr)
, Layouting::Widget_quick(this)
{
}
RubberBand::~RubberBand() = default;

View File

@@ -9,17 +9,23 @@
Contact KDAB at <info@kdab.com> for commercial licensing options.
*/
#include "RubberBandQuick.h"
#include "RubberBand_qtquick.h"
#include "Config.h"
#include "qtquick/Platform_qtquick.h"
#include <QQmlEngine>
using namespace KDDockWidgets;
RubberBandQuick::RubberBandQuick(QQuickItem *parent)
: QWidgetAdapter(parent)
using namespace KDDockWidgets;
using namespace KDDockWidgets::Views;
RubberBand_qtquick::RubberBand_qtquick(QQuickItem *parent)
: View_qtquick(nullptr, Type::RubberBand, parent)
{
setVisible(false);
setZ(1000);
QQuickItem *visualItem = createItem(Config::self().qmlEngine(), QStringLiteral("qrc:/kddockwidgets/private/quick/qml/RubberBand.qml"));
QQuickItem *visualItem = createItem(plat()->qmlEngine(), QStringLiteral("qrc:/kddockwidgets/qtquick/views/qml/RubberBand.qml"));
visualItem->setParent(this);
visualItem->setParentItem(this);
}

View File

@@ -13,21 +13,18 @@
#define KD_MULTISPLITTER_RUBBERBAND_QUICK_H
#include "kddockwidgets/docks_export.h"
#include "Widget_quick.h"
#include "View_qtquick.h"
#include <QQuickItem>
namespace Layouting {
namespace KDDockWidgets::Views {
// TODO: Finish rubberband
class DOCKS_EXPORT_FOR_UNIT_TESTS RubberBand
: public QQuickItem,
public Layouting::Widget_quick
class DOCKS_EXPORT RubberBand_qtquick
: public View_qtquick
{
Q_OBJECT
public:
explicit RubberBand(Layouting::Widget *parent);
~RubberBand() override;
explicit RubberBand_qtquick(QQuickItem *parent);
};
}