fly/flightgear
1
0
Fork 0
Code Activity

Fix popup-width warning

Browse source
This commit is contained in:
James Turner 2018-06-28 09:07:51 +01:00
parent 81b9105a8f
commit 82f99a6a9e
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/GUI/qml/PopupChoice.qml
View file

@ -147,7 +147,7 @@ Item {
flags: Qt.Popup flags: Qt.Popup
height: choicesColumn.childrenRect.height + Style.margin * 2 height: choicesColumn.childrenRect.height + Style.margin * 2
width: choicesColumn.childrenRect.width + Style.margin * 2 width: choicesColumn.width + Style.margin * 2
visible: false visible: false
color: "white" color: "white"
@ -163,6 +163,7 @@ Item {
spacing: Style.margin spacing: Style.margin
x: Style.margin x: Style.margin
y: Style.margin y: Style.margin
width: menuWidth
// optional header component: // optional header component:
Loader { Loader {
@ -171,10 +172,10 @@ Item {
// default component is just a plain text element, same as // default component is just a plain text element, same as
// normal items // normal items
sourceComponent: Text { sourceComponent: StyledText {
text: root.headerText text: root.headerText
height: implicitHeight + Style.margin height: implicitHeight + Style.margin
width: popupFrame.width width: choicesColumn.width
} }
height: item ? item.height : 0 height: item ? item.height : 0
@ -192,6 +193,17 @@ Item {
} }
} // of header loader } // of header loader
function calculateMenuWidth()
{
var minWidth = 0;
for (var i = 0; i < choicesRepeater.count; i++) {
minWidth = Math.max(minWidth, choicesRepeater.itemAt(i).implicitWidth);
}
return minWidth;
}
readonly property int menuWidth: calculateMenuWidth()
// main item repeater // main item repeater
Repeater { Repeater {
id: choicesRepeater id: choicesRepeater