Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

"options" property added in DockWidgetInstantiator.h/cpp #509

Open
wants to merge 2 commits into
base: 2.1
Choose a base branch
from
Open

"options" property added in DockWidgetInstantiator.h/cpp #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd23e62
options property added in DockWidgetInstantiator.h/cpp
evg1234 Jun 14, 2024
e55964d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion src/qtquick/DockWidgetInstantiator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class DockWidgetInstantiator::Private
QString m_title;
Core::DockWidget *m_dockWidget = nullptr;
QVector<QString> m_affinities;
KDDockWidgets::DockWidgetOptions m_dockWidgetOptions;

KDBindings::ScopedConnection titleConnection;
KDBindings::ScopedConnection closedConnection;
Expand Down Expand Up @@ -226,6 +227,19 @@ void DockWidgetInstantiator::setAffinities(const QVector<QString> &affinities)
}
}

KDDockWidgets::DockWidgetOptions KDDockWidgets::DockWidgetInstantiator::options() const
{
return d->m_dockWidgetOptions;
}

void KDDockWidgets::DockWidgetInstantiator::setOptions(DockWidgetOptions dockWidgetOptions)
{
if (d->m_dockWidgetOptions != dockWidgetOptions) {
d->m_dockWidgetOptions = dockWidgetOptions;
Q_EMIT optionsChanged(dockWidgetOptions);
}
}

void DockWidgetInstantiator::componentComplete()
{
if (d->m_uniqueName.isEmpty()) {
Expand All @@ -251,7 +265,7 @@ void DockWidgetInstantiator::componentComplete()
}

d->m_dockWidget = ViewFactory::self()
->createDockWidget(d->m_uniqueName, qmlEngine(this))
->createDockWidget(d->m_uniqueName, qmlEngine(this), d->m_dockWidgetOptions)
->asDockWidgetController();

d->titleConnection = d->m_dockWidget->d->titleChanged.connect([this](const QString &title) { Q_EMIT titleChanged(title); });
Expand Down
7 changes: 6 additions & 1 deletion src/qtquick/DockWidgetInstantiator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@

#include <optional>

#include "KDDockWidgets.h"

namespace KDDockWidgets {

/**
Expand All @@ -45,6 +47,8 @@ class DockWidgetInstantiator : public QQuickItem
Q_PROPERTY(bool isFloating READ isFloating WRITE setFloating NOTIFY isFloatingChanged)
Q_PROPERTY(bool isOpen READ isOpen NOTIFY isOpenChanged)
Q_PROPERTY(QVector<QString> affinities READ affinities WRITE setAffinities NOTIFY affinitiesChanged)
Q_PROPERTY(KDDockWidgets::DockWidgetOptions options READ options WRITE setOptions NOTIFY optionsChanged)

public:
DockWidgetInstantiator();
~DockWidgetInstantiator() override;
Expand All @@ -68,7 +72,8 @@ class DockWidgetInstantiator : public QQuickItem
void setFloating(bool);
QVector<QString> affinities() const;
void setAffinities(const QVector<QString> &);

DockWidgetOptions options() const;
void setOptions(DockWidgetOptions dockWidgetOptions);
Q_INVOKABLE void addDockWidgetAsTab(QQuickItem *other,
KDDockWidgets::InitialVisibilityOption = {});

Expand Down
Loading