Remove View::maximumSize() as we already have View::maxSizeHint()
Having both was due to QWidgets having both. For QtQuick and other frontends we only want the latter.
This commit is contained in:
@@ -202,11 +202,6 @@ bool ViewWrapper_qtwidgets::isMinimized() const
|
||||
return m_widget->isMinimized();
|
||||
}
|
||||
|
||||
QSize ViewWrapper_qtwidgets::maximumSize() const
|
||||
{
|
||||
return m_widget->maximumSize();
|
||||
}
|
||||
|
||||
void ViewWrapper_qtwidgets::setSize(int x, int y)
|
||||
{
|
||||
m_widget->resize(x, y);
|
||||
@@ -387,3 +382,8 @@ SizePolicy ViewWrapper_qtwidgets::verticalSizePolicy() const
|
||||
{
|
||||
return SizePolicy(m_widget->sizePolicy().verticalPolicy());
|
||||
}
|
||||
|
||||
QSize ViewWrapper_qtwidgets::maxSizeHint() const
|
||||
{
|
||||
return m_widget->maximumSize();
|
||||
}
|
||||
|
||||
@@ -35,7 +35,6 @@ public:
|
||||
void activateWindow() override;
|
||||
bool isMaximized() const override;
|
||||
bool isMinimized() const override;
|
||||
QSize maximumSize() const override;
|
||||
void setSize(int width, int height) override;
|
||||
bool is(Type) const override;
|
||||
std::shared_ptr<Window> window() const override;
|
||||
@@ -59,6 +58,7 @@ public:
|
||||
Qt::FocusPolicy focusPolicy() const override;
|
||||
void setFocusPolicy(Qt::FocusPolicy) override;
|
||||
bool hasFocus() const override;
|
||||
QSize maxSizeHint() const override;
|
||||
SizePolicy horizontalSizePolicy() const override;
|
||||
SizePolicy verticalSizePolicy() const override;
|
||||
QWidget *widget() const;
|
||||
|
||||
@@ -78,7 +78,7 @@ public:
|
||||
// to have a max size honoured
|
||||
|
||||
const QSize min = minSize();
|
||||
QSize max = maximumSize();
|
||||
QSize max = Base::maximumSize();
|
||||
max = boundedMaxSize(min, max); // for safety against weird values
|
||||
|
||||
const SizePolicy vPolicy = verticalSizePolicy();
|
||||
@@ -93,11 +93,6 @@ public:
|
||||
return max;
|
||||
}
|
||||
|
||||
QSize maximumSize() const override
|
||||
{
|
||||
return Base::maximumSize();
|
||||
}
|
||||
|
||||
QRect geometry() const override
|
||||
{
|
||||
return Base::geometry();
|
||||
|
||||
Reference in New Issue
Block a user