Skip to content

Fix handling of the relation reference height following combobox text warp improvement #7683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nirvn merged 1 commit into from
Jul 6, 2026
+9 −5
Merged

Fix handling of the relation reference height following combobox text warp improvement #7683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/qml/RelationCombobox.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,7 @@ Item {

Layout.preferredWidth: enabled ? 48 : 0
Layout.preferredHeight: 48
Layout.alignment: Qt.AlignTop

bgcolor: "transparent"
iconSource: Theme.getThemeVectorIcon("ic_baseline_search_white")
Expand All @@ -585,6 +586,7 @@ Item {

Layout.preferredWidth: comboBox.enabled ? 48 : 0
Layout.preferredHeight: 48
Layout.alignment: Qt.AlignTop

bgcolor: "transparent"
opacity: enabled ? 1 : 0.3
Expand Down
12 changes: 7 additions & 5 deletions src/qml/editorwidgets/RelationReference.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ import Theme
import ".."

EditorWidgetBase {
id: relationReferenceEditorWidgetBase
height: childrenRect.height
id: relationReferenceEditorWidget

anchors {
left: parent.left
right: parent.right
}
height: Math.max(48, relationReference.height) + 4

property bool showOpenFormButton: config['ShowOpenFormButton'] === undefined || config['ShowOpenFormButton'] === true
property var _rel: RelationUtils.resolveReferencingRelation(qgisProject, currentLayer, field.name, config['Relation'])
Expand Down Expand Up @@ -40,10 +41,10 @@ EditorWidgetBase {
}

RowLayout {
id: relationReferenceEditorWidgetLayout
anchors {
left: parent.left
right: parent.right
top: parent.top
}
spacing: 5

Expand All @@ -58,7 +59,7 @@ EditorWidgetBase {
relation: _rel

onRequestJumpToPoint: function (center, scale, handleMargins) {
relationReferenceEditorWidgetBase.requestJumpToPoint(center, scale, handleMargins);
relationReferenceEditorWidget.requestJumpToPoint(center, scale, handleMargins);
}
}

Expand All @@ -67,6 +68,7 @@ EditorWidgetBase {

property bool isVisible: listModel.currentLayer !== undefined && listModel.currentLayer !== null && listModel.currentLayer.geometryType() !== Qgis.GeometryType.Unknown && listModel.currentLayer.geometryType() !== Qgis.GeometryType.Null

Layout.alignment: Qt.AlignTop
visible: isVisible
enabled: relationReference.currentKeyValue !== undefined && relationReference.currentKeyValue !== ''
width: isVisible && enabled ? 48 : 0
Expand All @@ -91,8 +93,8 @@ EditorWidgetBase {
QfToolButton {
id: openFormButton

Layout.alignment: Qt.AlignTop
enabled: showOpenFormButton && relationReference.currentKeyValue !== undefined && relationReference.currentKeyValue !== ''

width: enabled ? 48 : 0
height: 48

Expand Down
Loading