168492376
/
qskinny
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make icons quadratic 

with some quick fixes as usual
This commit is contained in:
Peter Hartmann 2020-08-26 15:29:39 +02:00
parent 02d6315287
commit f0ff236203
5 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/iot-dashboard/Humidity.cpp
View File

@ -18,6 +18,8 @@ Humidity::Humidity(QQuickItem *parent)
QskGradient gradient(QskGradient::Vertical, "#6776FF", "#6100FF"); QskGradient gradient(QskGradient::Vertical, "#6776FF", "#6100FF");
auto* icon = new RoundedIcon("humidity", gradient, this); auto* icon = new RoundedIcon("humidity", gradient, this);
icon->setMinimumWidth(68);
icon->setFixedSize(68, 68); // ### fix properly
auto *titleAndValue = new QskLinearBox(Qt::Vertical, this); auto *titleAndValue = new QskLinearBox(Qt::Vertical, this);

2
examples/iot-dashboard/IndoorTemperature.cpp
View File

@ -18,6 +18,8 @@ IndoorTemperature::IndoorTemperature(QQuickItem *parent)
QskGradient gradient(QskGradient::Vertical, "#ff7d34", "#ff3122"); QskGradient gradient(QskGradient::Vertical, "#ff7d34", "#ff3122");
auto* icon = new RoundedIcon("indoor-temperature", gradient, this); auto* icon = new RoundedIcon("indoor-temperature", gradient, this);
icon->setMinimumWidth(68);
icon->setFixedSize(68, 68); // ### fix properly
auto *titleAndValue = new QskLinearBox(Qt::Vertical, this); auto *titleAndValue = new QskLinearBox(Qt::Vertical, this);

1
examples/iot-dashboard/MyDevices.cpp
View File

@ -21,6 +21,7 @@ namespace {
m_icon = new RoundedIcon(QString(), gradient, this); m_icon = new RoundedIcon(QString(), gradient, this);
m_icon->setOpacity(0.15); m_icon->setOpacity(0.15);
m_icon->setPreferredWidth(60);
addItem(m_icon); addItem(m_icon);
auto* textLabel = new QskTextLabel(name, this); auto* textLabel = new QskTextLabel(name, this);

10
examples/iot-dashboard/RoundedIcon.cpp
View File

@ -16,6 +16,8 @@ RoundedIcon::RoundedIcon(const QString& iconName, const QskGradient& gradient, Q
setGradientHint(Panel, gradient); setGradientHint(Panel, gradient);
setBoxShapeHint(Panel, 6 ); setBoxShapeHint(Panel, 6 );
setSizePolicy(QskSizePolicy::Minimum, QskSizePolicy::Constrained);
QString fileName = ":/images/" + iconName + ".png"; QString fileName = ":/images/" + iconName + ".png";
if(QFile::exists(fileName)) if(QFile::exists(fileName))
@ -34,3 +36,11 @@ void RoundedIcon::updateLayout()
m_graphicLabel->setPosition( { ( width() - m_graphicLabel->width() ) / 2, ( height() - m_graphicLabel->height() ) / 2 } ); m_graphicLabel->setPosition( { ( width() - m_graphicLabel->width() ) / 2, ( height() - m_graphicLabel->height() ) / 2 } );
} }
} }
QSizeF RoundedIcon::contentsSizeHint( Qt::SizeHint /*which*/, const QSizeF& size ) const
{
QSizeF ret = size;
ret.setHeight( size.width() );
return ret;
}

1
examples/iot-dashboard/RoundedIcon.h
View File

@ -15,6 +15,7 @@ public:
protected: protected:
void updateLayout() override; void updateLayout() override;
virtual QSizeF contentsSizeHint( Qt::SizeHint, const QSizeF& ) const override;
private: private:
QString m_iconName; QString m_iconName;