aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBramastyo Harimukti <bramastyo.harimukti.santoso@pelagicore.com>2017-07-26 14:27:18 +0200
committerBramastyo Harimukti Santoso <bramastyo.harimukti.santoso@pelagicore.com>2017-07-31 17:08:00 +0000
commitaaf16691e15570fa0848a29ed42b7b0416bc809e (patch)
tree33dbc8588bea6f5e9245bab576450eff28a8c53f
parent1dd10e1e91fbfdc7cbedd04caa9cb1b0e01b91b5 (diff)
Popup adjustment to the potrait mode
Change-Id: Ide42e7ffd093f655169d55e7df842d24e1d7c059 Reviewed-by: Nedim Hadzic <nedim.hadzic@pelagicore.com>
-rw-r--r--imports/shared/utils/Style.qml2
-rw-r--r--sysui/popup/PopupContainer.qml3
2 files changed, 3 insertions, 2 deletions
diff --git a/imports/shared/utils/Style.qml b/imports/shared/utils/Style.qml
index 14bbae5..0817665 100644
--- a/imports/shared/utils/Style.qml
+++ b/imports/shared/utils/Style.qml
@@ -97,7 +97,7 @@ QtObject {
//Popup config
property real popupWidth: isPotrait ? hspan(12) : hspan(8)
- property real popupHeight: vspan(6)
+ property real popupHeight: isPotrait ? vspan(5) : vspan(6)
property int notificationCenterWidth: hspan(notificationCenterSpan)
property real launcherHeight: vspan(launcherSpan)
diff --git a/sysui/popup/PopupContainer.qml b/sysui/popup/PopupContainer.qml
index 4521274..3ed38e7 100644
--- a/sysui/popup/PopupContainer.qml
+++ b/sysui/popup/PopupContainer.qml
@@ -81,10 +81,11 @@ MouseArea {
anchors.top: popupHeader.bottom
anchors.topMargin: 10
font.pixelSize: Style.fontSizeM
- text: root.contentAvailable && root.popupContent !== undefined ? root.popupContent.toString() : ""
+ text: root.contentAvailable !== undefined && root.popupContent !== undefined ? root.popupContent.toString() : ""
horizontalAlignment: Text.AlignHCenter
elide: Text.ElideRight
wrapMode: Text.WordWrap
+ visible: PopupModel.popupVisible
}
ProgressBar {