ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the chatbar so that the icons show on android. Overring the contentItem was what was causing them to disappear.

Browse Source
This commit is contained in:
James Graham
2025-09-13 12:59:50 +01:00
committed by Joshua Goins
parent 4a39810923
commit f65e9f7599
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/CMakeLists.txt
View File

@@ -327,6 +327,7 @@ if(ANDROID)
"kt-restore-defaults-symbolic" "kt-restore-defaults-symbolic"
"user-symbolic" "user-symbolic"
"mark-location-symbolic" "mark-location-symbolic"
"amarok_playcount"
${KIRIGAMI_ADDONS_ICONS} ${KIRIGAMI_ADDONS_ICONS}
) )

8
src/chatbar/ChatBar.qml
View File

@@ -375,7 +375,9 @@ QQC2.Control {
id: actionDelegate id: actionDelegate
required property BusyAction modelData required property BusyAction modelData
icon.name: modelData.isBusy ? "" : (modelData.icon.name.length > 0 ? modelData.icon.name : modelData.icon.source) icon.name: modelData.isBusy ? "" : (modelData.icon.name.length > 0 ? modelData.icon.name : modelData.icon.source)
onClicked: modelData.trigger() onClicked: if (!pieProgress.visible) {
modelData.trigger()
}
padding: Kirigami.Units.smallSpacing padding: Kirigami.Units.smallSpacing
@@ -383,7 +385,9 @@ QQC2.Control {
QQC2.ToolTip.text: modelData.tooltip QQC2.ToolTip.text: modelData.tooltip
QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
contentItem: PieProgressBar { PieProgressBar {
id: pieProgress
anchors.fill: parent
visible: actionDelegate.modelData.isBusy visible: actionDelegate.modelData.isBusy
progress: root.currentRoom.fileUploadingProgress progress: root.currentRoom.fileUploadingProgress
} }