philipp/KDDockWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qtquick: Remove isWrapper

Browse Source 
Will readd it if it's really needed
This commit is contained in:
Sergio Martins
2022-05-28 11:57:20 +01:00
parent 56a871b86b
commit 2e6924ec43
2 changed files with 0 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/qtquick/views/View_qtquick.cpp
View File

@@ -409,29 +409,12 @@ QSize View_qtquick::sizeHint() const
QSize View_qtquick::minSize() const
{
if (m_isWrapper) {
const auto children = childItems();
if (!children.isEmpty()) {
const QSize min = children.constFirst()->property("kddockwidgets_min_size").toSize();
return min.expandedTo(Layouting::Item::hardcodedMinimumSize);
}
}
const QSize min = property("kddockwidgets_min_size").toSize();
return min.expandedTo(Layouting::Item::hardcodedMinimumSize);
}
QSize View_qtquick::maxSizeHint() const
{
if (m_isWrapper) {
const auto children = childItems();
if (!children.isEmpty()) {
const QSize max = children.constFirst()->property("kddockwidgets_max_size").toSize();
return max.isEmpty() ? Layouting::Item::hardcodedMaximumSize
: max.boundedTo(Layouting::Item::hardcodedMaximumSize);
}
}
const QSize max = property("kddockwidgets_max_size").toSize();
return max.isEmpty() ? Layouting::Item::hardcodedMaximumSize
: max.boundedTo(Layouting::Item::hardcodedMaximumSize);
@@ -799,16 +782,6 @@ QVector<std::shared_ptr<View>> View_qtquick::childViews() const
return result;
}
void View_qtquick::setIsWrapper()
{
m_isWrapper = true;
}
bool View_qtquick::isWrapper() const
{
return m_isWrapper;
}
void View_qtquick::onWindowStateChangeEvent(QWindowStateChangeEvent *)
{
if (QWindow *window = QQuickItem::window()) {

7
src/qtquick/views/View_qtquick.h
View File

@@ -158,12 +158,6 @@ public:
void setMouseTracking(bool enable) override;
QVector<std::shared_ptr<View>> childViews() const override;
// TODOv2: Check if this is still needed
void setIsWrapper();
// TODOv2: Check if this is still needed
bool isWrapper() const;
/// @brief This is equivalent to "anchors.fill: parent but in C++
void makeItemFillParent(QQuickItem *item);
void onWindowStateChangeEvent(QWindowStateChangeEvent *);
@@ -194,7 +188,6 @@ private:
int m_widgetAttributes = 0; // Qt::WidgetAttribute
Qt::FocusPolicy m_focusPolicy = Qt::NoFocus;
bool m_mouseTrackingEnabled = false;
bool m_isWrapper = false; // TODOv2: What's this about
QRect m_normalGeometry;
Qt::WindowStates m_oldWindowState = Qt::WindowState::WindowNoState;
MouseEventRedirector *m_mouseEventRedirector = nullptr;