alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

correctly pass fillWidth and hints to outer layers

Browse Source
This commit is contained in:
Marco Martin 2013-08-19 18:29:14 +02:00
parent ea69577005
commit d68e452545
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/scriptengines/qml/plasmoid/appletinterface.cpp
View File

@ -534,7 +534,7 @@ qreal AppletInterface::readGraphicsObjectSizeHint(const char *hint) const
} }
if (prop.isValid() && prop.canConvert<qreal>()) { if (prop.isValid() && prop.canConvert<qreal>()) {
return qMax(qreal(1), prop.toReal()); return prop.toReal();
} else { } else {
return -1; return -1;
} }
@ -715,6 +715,8 @@ void AppletInterface::compactRepresentationCheck()
this, SIGNAL(implicitHeightChanged())); this, SIGNAL(implicitHeightChanged()));
} }
emit fillWidthChanged();
emit fillHeightChanged();
emit minimumWidthChanged(); emit minimumWidthChanged();
emit minimumHeightChanged(); emit minimumHeightChanged();
emit implicitWidthChanged(); emit implicitWidthChanged();
@ -766,6 +768,8 @@ void AppletInterface::compactRepresentationCheck()
this, SIGNAL(implicitHeightChanged())); this, SIGNAL(implicitHeightChanged()));
} }
emit fillWidthChanged();
emit fillHeightChanged();
emit minimumWidthChanged(); emit minimumWidthChanged();
emit minimumHeightChanged(); emit minimumHeightChanged();
emit implicitWidthChanged(); emit implicitWidthChanged();

8
src/scriptengines/qml/plasmoid/appletinterface.h
View File

@ -74,8 +74,8 @@ class AppletInterface : public QQuickItem
Q_PROPERTY(qreal maximumWidth READ maximumWidth NOTIFY maximumWidthChanged) Q_PROPERTY(qreal maximumWidth READ maximumWidth NOTIFY maximumWidthChanged)
Q_PROPERTY(qreal maximumHeight READ maximumHeight NOTIFY maximumHeightChanged) Q_PROPERTY(qreal maximumHeight READ maximumHeight NOTIFY maximumHeightChanged)
//implicitWidth/height is already there //implicitWidth/height is already there
//Q_PROPERTY(qreal implicitWidth READ implicitWidth NOTIFY implicitWidthChanged) Q_PROPERTY(qreal implicitWidth READ implicitWidth NOTIFY implicitWidthChanged)
//Q_PROPERTY(qreal implicitHeight READ implicitHeight NOTIFY implicitHeightChanged) Q_PROPERTY(qreal implicitHeight READ implicitHeight NOTIFY implicitHeightChanged)
Q_PROPERTY(bool fillWidth READ fillWidth NOTIFY fillWidthChanged) Q_PROPERTY(bool fillWidth READ fillWidth NOTIFY fillWidthChanged)
Q_PROPERTY(bool fillHeight READ fillHeight NOTIFY fillHeightChanged) Q_PROPERTY(bool fillHeight READ fillHeight NOTIFY fillHeightChanged)
@ -181,8 +181,8 @@ Q_SIGNALS:
void minimumHeightChanged(); void minimumHeightChanged();
void maximumWidthChanged(); void maximumWidthChanged();
void maximumHeightChanged(); void maximumHeightChanged();
//void implicitWidthChanged(); void implicitWidthChanged();
//void implicitHeightChanged(); void implicitHeightChanged();
void fillWidthChanged(); void fillWidthChanged();
void fillHeightChanged(); void fillHeightChanged();

2
src/shell/qmlpackages/desktop/contents/applet/CompactApplet.qml
View File

@ -34,6 +34,8 @@ Item {
property int implicitWidth: compactRepresentation && compactRepresentation.implicitWidth !== undefined ? compactRepresentation.implicitWidth : -1 property int implicitWidth: compactRepresentation && compactRepresentation.implicitWidth !== undefined ? compactRepresentation.implicitWidth : -1
property int implicitHeight: compactRepresentation && compactRepresentation.implicitHeight !== undefined ? compactRepresentation.implicitHeight : -1 property int implicitHeight: compactRepresentation && compactRepresentation.implicitHeight !== undefined ? compactRepresentation.implicitHeight : -1
property bool fillWidth: compactRepresentation && compactRepresentation.fillWidth !== undefined ? compactRepresentation.fillWidth : false
property bool fillHeight: compactRepresentation && compactRepresentation.fillHeight !== undefined ? compactRepresentation.fillHeight : false
property Item applet property Item applet