qtquick: Move the ClassicIndicator Q_PROPERTIES to the view

as that's what will be exposed to QtQuick
This commit is contained in:
Sergio Martins
2022-06-04 21:45:11 +01:00
parent 56ca80e8fc
commit ec4e22b5ae
8 changed files with 107 additions and 88 deletions

View File

@@ -57,51 +57,6 @@ QPoint ClassicIndicators::posForIndicator(DropLocation loc) const
return m_indicatorWindow->posForIndicator(loc);
}
bool ClassicIndicators::innerLeftIndicatorVisible() const
{
return dropIndicatorVisible(DropLocation_Left);
}
bool ClassicIndicators::innerRightIndicatorVisible() const
{
return dropIndicatorVisible(DropLocation_Right);
}
bool ClassicIndicators::innerTopIndicatorVisible() const
{
return dropIndicatorVisible(DropLocation_Top);
}
bool ClassicIndicators::innerBottomIndicatorVisible() const
{
return dropIndicatorVisible(DropLocation_Bottom);
}
bool ClassicIndicators::outterLeftIndicatorVisible() const
{
return dropIndicatorVisible(DropLocation_OutterLeft);
}
bool ClassicIndicators::outterRightIndicatorVisible() const
{
return dropIndicatorVisible(DropLocation_OutterRight);
}
bool ClassicIndicators::outterTopIndicatorVisible() const
{
return dropIndicatorVisible(DropLocation_OutterTop);
}
bool ClassicIndicators::outterBottomIndicatorVisible() const
{
return dropIndicatorVisible(DropLocation_OutterBottom);
}
bool ClassicIndicators::tabIndicatorVisible() const
{
return dropIndicatorVisible(DropLocation_Center);
}
bool ClassicIndicators::onResize(QSize)
{
m_indicatorWindow->resize(window()->size());

View File

@@ -27,37 +27,12 @@ namespace Controllers {
class DOCKS_EXPORT ClassicIndicators : public DropIndicatorOverlay
{
Q_OBJECT
// Properties for QML
Q_PROPERTY(bool innerLeftIndicatorVisible READ innerLeftIndicatorVisible NOTIFY indicatorsVisibleChanged)
Q_PROPERTY(bool innerRightIndicatorVisible READ innerRightIndicatorVisible NOTIFY indicatorsVisibleChanged)
Q_PROPERTY(bool innerTopIndicatorVisible READ innerTopIndicatorVisible NOTIFY indicatorsVisibleChanged)
Q_PROPERTY(bool innerBottomIndicatorVisible READ innerBottomIndicatorVisible NOTIFY indicatorsVisibleChanged)
Q_PROPERTY(bool outterLeftIndicatorVisible READ outterLeftIndicatorVisible NOTIFY indicatorsVisibleChanged)
Q_PROPERTY(bool outterRightIndicatorVisible READ outterRightIndicatorVisible NOTIFY indicatorsVisibleChanged)
Q_PROPERTY(bool outterTopIndicatorVisible READ outterTopIndicatorVisible NOTIFY indicatorsVisibleChanged)
Q_PROPERTY(bool outterBottomIndicatorVisible READ outterBottomIndicatorVisible NOTIFY indicatorsVisibleChanged)
Q_PROPERTY(bool tabIndicatorVisible READ tabIndicatorVisible NOTIFY indicatorsVisibleChanged)
public:
explicit ClassicIndicators(Controllers::DropArea *dropArea);
~ClassicIndicators() override;
DropLocation hover_impl(QPoint globalPos) override;
QPoint posForIndicator(DropLocation) const override;
// Lots of getters needed because of QML:
bool innerLeftIndicatorVisible() const;
bool innerRightIndicatorVisible() const;
bool innerTopIndicatorVisible() const;
bool innerBottomIndicatorVisible() const;
bool outterLeftIndicatorVisible() const;
bool outterRightIndicatorVisible() const;
bool outterTopIndicatorVisible() const;
bool outterBottomIndicatorVisible() const;
bool tabIndicatorVisible() const;
bool onResize(QSize newSize);
void setDropLocation(DropLocation);
void updateVisibility() override;