Skip to content

Increase result font size, harmonize bold usage, implement conditional features list bold styling #7741

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 4 commits into from
Jul 13, 2026
Merged

Increase result font size, harmonize bold usage, implement conditional features list bold styling #7741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
77475ed
Slightly increase result font size, harmonize bold usage across vario…
nirvn Jul 12, 2026
72898a7
Add a strongResultFont variant to Theme and use it
nirvn Jul 12, 2026
6b4c5ac
Implement missing bold conditional styling for features list now that…
nirvn Jul 12, 2026
49f3305
Improve horizontal text alignment of search bar result titles
nirvn Jul 12, 2026
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
1 change: 1 addition & 0 deletions src/core/multifeaturelistmodel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ class MultiFeatureListModel : public QSortFilterProxyModel
EditGeometryRole,
ConditionalTextColorRole,
ConditionalBackgroundColorRole,
ConditionalFontBoldRole,
ConditionalFontItalicRole,
ConditionalFontUnderlineRole,
ConditionalFontStrikeOutRole,
Expand Down
16 changes: 16 additions & 0 deletions src/core/multifeaturelistmodelbase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,7 @@ QHash<int, QByteArray> MultiFeatureListModelBase::roleNames() const
roleNames[MultiFeatureListModel::ConditionalFontUnderlineRole] = "conditionalFontUnderline";
roleNames[MultiFeatureListModel::ConditionalFontStrikeOutRole] = "conditionalFontStrikeOut";
roleNames[MultiFeatureListModel::ConditionalFontItalicRole] = "conditionalFontItalic";
roleNames[MultiFeatureListModel::ConditionalFontBoldRole] = "conditionalFontBold";

return roleNames;
}
Expand Down Expand Up @@ -414,6 +415,19 @@ QVariant MultiFeatureListModelBase::data( const QModelIndex &index, int role ) c
return QVariant();
break;

case MultiFeatureListModel::ConditionalFontBoldRole:
if ( vlayer )
{
const QString featureUniqueKey = QStringLiteral( "%1:%2" ).arg( vlayer->id(), QString::number( feature->second.id() ) );
if ( mFeaturesConditionalStyle.contains( featureUniqueKey ) )
{
return mFeaturesConditionalStyle[featureUniqueKey].font().bold();
}
}

return false;
break;

case MultiFeatureListModel::ConditionalFontItalicRole:
if ( vlayer )
{
Expand Down Expand Up @@ -1068,6 +1082,7 @@ void MultiFeatureListModelBase::attributeValueChanged( QgsFeatureId fid, int idx
{
rolesChanged << MultiFeatureListModel::ConditionalBackgroundColorRole
<< MultiFeatureListModel::ConditionalTextColorRole
<< MultiFeatureListModel::ConditionalFontBoldRole
<< MultiFeatureListModel::ConditionalFontItalicRole
<< MultiFeatureListModel::ConditionalFontUnderlineRole
<< MultiFeatureListModel::ConditionalFontStrikeOutRole;
Expand Down Expand Up @@ -1117,6 +1132,7 @@ void MultiFeatureListModelBase::geometryChanged( QgsFeatureId fid, const QgsGeom
{
rolesChanged << MultiFeatureListModel::ConditionalBackgroundColorRole
<< MultiFeatureListModel::ConditionalTextColorRole
<< MultiFeatureListModel::ConditionalFontBoldRole
<< MultiFeatureListModel::ConditionalFontItalicRole
<< MultiFeatureListModel::ConditionalFontUnderlineRole
<< MultiFeatureListModel::ConditionalFontStrikeOutRole;
Expand Down
4 changes: 3 additions & 1 deletion src/core/theme.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ class QFIELD_CORE_EXPORT Theme final : public QObject
Q_PROPERTY( QFont resultFont READ resultFont NOTIFY fontScaleChanged )
Q_PROPERTY( QFont strongFont READ strongFont NOTIFY fontScaleChanged )
Q_PROPERTY( QFont strongTipFont READ strongTipFont NOTIFY fontScaleChanged )
Q_PROPERTY( QFont strongResultFont READ strongResultFont NOTIFY fontScaleChanged )
Q_PROPERTY( QFont secondaryTitleFont READ secondaryTitleFont NOTIFY fontScaleChanged )
Q_PROPERTY( QFont titleFont READ titleFont NOTIFY fontScaleChanged )
Q_PROPERTY( QFont strongTitleFont READ strongTitleFont NOTIFY fontScaleChanged )
Expand Down Expand Up @@ -297,9 +298,10 @@ class QFIELD_CORE_EXPORT Theme final : public QObject
QFont defaultFont() const { return makeFont( 1.0, false ); }
QFont tinyFont() const { return makeFont( 0.75, false ); }
QFont tipFont() const { return makeFont( 0.875, false ); }
QFont resultFont() const { return makeFont( 0.8125, false ); }
QFont resultFont() const { return makeFont( 0.9, false ); }
QFont strongFont() const { return makeFont( 1.0, true ); }
QFont strongTipFont() const { return makeFont( 0.875, true ); }
QFont strongResultFont() const { return makeFont( 0.9, true ); }
QFont secondaryTitleFont() const { return makeFont( 1.125, false ); }
QFont titleFont() const { return makeFont( 1.25, false ); }
QFont strongTitleFont() const { return makeFont( 1.25, true ); }
Expand Down
6 changes: 2 additions & 4 deletions src/qml/BookmarkList.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,8 +387,7 @@ QfPaneDrawer {
horizontalCenter: parent.horizontalCenter
verticalCenter: parent.verticalCenter
}
font.bold: true
font.pointSize: Theme.resultFont.pointSize
font: Theme.strongResultFont
color: Theme.mainTextColor
text: {
switch (section) {
Expand Down Expand Up @@ -450,8 +449,7 @@ QfPaneDrawer {
right: parent.right
verticalCenter: parent.verticalCenter
}
font.bold: true
font.pointSize: Theme.resultFont.pointSize
font: Theme.resultFont
color: Theme.mainTextColor
text: BookmarkName !== '' ? BookmarkName : qsTr("Untitled bookmark")
wrapMode: Text.WordWrap
Expand Down
2 changes: 1 addition & 1 deletion src/qml/DashBoard.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ Drawer {
icon.source: legend.model.isCollapsed ? Theme.getThemeVectorIcon('ic_expand_all_24dp') : Theme.getThemeVectorIcon('ic_collapse_all_24dp')
icon.width: 14
icon.height: 14
font.pointSize: 8
font.pointSize: Theme.tinyFont.pointSize - 2

onClicked: {
legend.model.setAllCollapsed(!legend.model.isCollapsed);
Expand Down
5 changes: 2 additions & 3 deletions src/qml/FeatureListForm.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,7 @@ QfPaneDrawer {
horizontalCenter: parent.horizontalCenter
verticalCenter: parent.verticalCenter
}
font.bold: true
font.pointSize: Theme.resultFont.pointSize
font: Theme.strongResultFont
color: Theme.mainTextColor
text: section
}
Expand Down Expand Up @@ -300,8 +299,8 @@ QfPaneDrawer {
right: parent.right
verticalCenter: parent.verticalCenter
}
font.bold: true
font.pointSize: Theme.resultFont.pointSize
font.bold: conditionalFontBold
font.italic: conditionalFontItalic
font.underline: conditionalFontUnderline
font.strikeout: conditionalFontStrikeOut
Expand Down
13 changes: 5 additions & 8 deletions src/qml/LocatorItem.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,8 +395,7 @@ Item {
anchors.leftMargin: 5
anchors.rightMargin: 5
text: Name + ' (' + Prefix + ')' + (Prefix === 'f' && dashBoard.activeLayer ? ' — ' + dashBoard.activeLayer.name : '')
font.bold: false
font.pointSize: Theme.resultFont.pointSize
font: Theme.resultFont
color: Theme.mainTextColor
elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft
Expand All @@ -409,8 +408,7 @@ Item {
anchors.leftMargin: 5
anchors.rightMargin: 5
text: Description || ''
font.bold: false
font.pointSize: Theme.resultFont.pointSize
font: Theme.resultFont
color: Theme.secondaryTextColor
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignLeft
Expand Down Expand Up @@ -482,11 +480,11 @@ Item {
anchors.leftMargin: 5
anchors.rightMargin: 5
text: isFilterName ? ResultFilterName : typeof (model.Text) == 'string' ? model.Text.trim() : ''
font.bold: false
font.bold: isFilterName || isGroup
font.pointSize: Theme.resultFont.pointSize
color: isFilterName ? Theme.mainOverlayColor : Theme.mainTextColor
elide: Text.ElideRight
horizontalAlignment: isGroup ? Text.AlignHCenter : Text.AlignLeft
horizontalAlignment: isFilterName || isGroup ? Text.AlignHCenter : Text.AlignLeft
}

Text {
Expand All @@ -497,8 +495,7 @@ Item {
anchors.leftMargin: 5
anchors.rightMargin: 5
text: locatorBridge.getLocatorModelDescription(index)
font.bold: false
font.pointSize: Theme.resultFont.pointSize
font: Theme.resultFont
color: Theme.secondaryTextColor
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignLeft
Expand Down
6 changes: 2 additions & 4 deletions src/qml/ProcessingAlgorithmsList.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,7 @@ Item {
horizontalCenter: parent.horizontalCenter
verticalCenter: parent.verticalCenter
}
font.bold: true
font.pointSize: Theme.resultFont.pointSize
font: Theme.strongResultFont
color: Theme.mainTextColor
text: section
}
Expand Down Expand Up @@ -134,8 +133,7 @@ Item {
verticalCenter: parent.verticalCenter
}
width: parent.width - favoriteButton.width - 10
font.bold: true
font.pointSize: Theme.resultFont.pointSize
font: Theme.resultFont
color: Theme.mainTextColor
text: AlgorithmName
}
Expand Down
3 changes: 1 addition & 2 deletions src/qml/QFieldCloudScreen.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,7 @@ Page {
horizontalCenter: parent.horizontalCenter
verticalCenter: parent.verticalCenter
}
font.bold: true
font.pointSize: Theme.resultFont.pointSize
font: Theme.strongResultFont
color: Theme.mainTextColor
text: section
}
Expand Down
3 changes: 1 addition & 2 deletions src/qml/QFieldLocalDataPickerScreen.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,7 @@ Page {
horizontalCenter: parent.horizontalCenter
verticalCenter: parent.verticalCenter
}
font.bold: true
font.pointSize: Theme.resultFont.pointSize
font: Theme.strongResultFont
color: Theme.mainTextColor
text: {
switch (parseInt(section)) {
Expand Down
6 changes: 2 additions & 4 deletions src/qml/RelationCombobox.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,7 @@ Item {
horizontalCenter: parent.horizontalCenter
verticalCenter: parent.verticalCenter
}
font.bold: true
font.pointSize: Theme.resultFont.pointSize
font: Theme.strongResultFont
color: Theme.mainTextColor
text: section
visible: featureListModel.displayGroupName
Expand Down Expand Up @@ -366,8 +365,7 @@ Item {
horizontalCenter: parent.horizontalCenter
verticalCenter: parent.verticalCenter
}
font.bold: true
font.pointSize: Theme.resultFont.pointSize
font: Theme.strongResultFont
color: Theme.mainTextColor
text: section
visible: featureListModel.displayGroupName
Expand Down
3 changes: 1 addition & 2 deletions src/qml/VariableEditor.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ ColumnLayout {
horizontalCenter: parent.horizontalCenter
verticalCenter: parent.verticalCenter
}
font.bold: true
font.pointSize: Theme.resultFont.pointSize
font: Theme.strongResultFont
color: Theme.mainTextColor
text: section == "GlobalScope" ? qsTr("Global variables") : qsTr("Project variables")
}
Expand Down
3 changes: 1 addition & 2 deletions src/qml/editorwidgets/ValueRelation.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,7 @@ EditorWidgetBase {
id: groupFieldValueText
width: parent.width
text: groupFieldValue ? groupFieldValue : ""
font.bold: true
font.pointSize: Theme.resultFont.pointSize
font: Theme.strongResultFont
color: Theme.mainTextColor
horizontalAlignment: Text.AlignHCenter
anchors.verticalCenter: parent.verticalCenter
Expand Down
7 changes: 3 additions & 4 deletions src/qml/editorwidgets/relationeditors/gallery_relation_editor.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,7 @@ RelationEditorBase {
width: listRow.width - listThumbnail.width - listFormButton.width - listMenuButton.width - listRow.spacing * 2
text: model.displayString
color: Theme.mainTextColor
font: Theme.defaultFont
font: Theme.resultFont
elide: Text.ElideRight
wrapMode: Text.WordWrap
maximumLineCount: 2
Expand Down Expand Up @@ -1212,7 +1212,7 @@ RelationEditorBase {
id: cardSuffixText
anchors.centerIn: parent
text: FileUtils.fileSuffix(attachmentFullPath).toUpperCase()
font.pointSize: Theme.tinyFont.pointSize
font.pointSize: Theme.tinyFont
font.weight: Font.Bold
color: Theme.mainTextColor
opacity: 0.6
Expand Down Expand Up @@ -1289,8 +1289,7 @@ RelationEditorBase {

text: model.displayString
color: Theme.mainTextColor
font.pointSize: Theme.tipFont.pointSize
font.weight: Font.Medium
font: Theme.tipFont
elide: Text.ElideRight
}

Expand Down
2 changes: 1 addition & 1 deletion src/qml/editorwidgets/relationeditors/ordered_relation_editor.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ RelationEditorBase {
topPadding: 5
bottomPadding: 5
leftPadding: featureImage.visible ? 5 : 0
font: Theme.defaultFont
font: Theme.resultFont
color: (!isEditable && isEditing) ? Theme.mainTextDisabledColor : Theme.mainTextColor
elide: Text.ElideRight
wrapMode: Text.WordWrap
Expand Down
2 changes: 1 addition & 1 deletion src/qml/editorwidgets/relationeditors/relation_editor.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ RelationEditorBase {
width: parent.width - viewButton.width - menuButton.width
topPadding: 5
bottomPadding: 5
font: Theme.defaultFont
font: Theme.resultFont
color: (!isEditable && isEditing) ? Theme.mainTextDisabledColor : Theme.mainTextColor
elide: Text.ElideRight
wrapMode: Text.WordWrap
Expand Down
Loading