data/linux.x86.linphone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix avatar picture

Browse source
This commit is contained in:
Gaelle Braud 2024-11-14 14:48:55 +01:00
parent c4721dc84c
commit 2af1431c5a
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Linphone/core/App.cpp
View file

@ -528,7 +528,7 @@ void App::initCore() {
if (mSettings) setLocale(mSettings->getConfigLocale()); if (mSettings) setLocale(mSettings->getConfigLocale());
}); });
} }
const QUrl url(u"qrc:/qt/qml/Linphone/view/Page/Window/Main/MainWindow.qml"_qs); const QUrl url("qrc:/qt/qml/Linphone/view/Page/Window/Main/MainWindow.qml");
QObject::connect( QObject::connect(
mEngine, &QQmlApplicationEngine::objectCreated, this, mEngine, &QQmlApplicationEngine::objectCreated, this,
[this, url, coreStarted](QObject *obj, const QUrl &objUrl) { [this, url, coreStarted](QObject *obj, const QUrl &objUrl) {

14
Linphone/view/Control/Display/Contact/Avatar.qml
View file

@ -31,7 +31,7 @@ Loader{
: displayNameObj : displayNameObj
? displayNameObj.value ? displayNameObj.value
: "" : ""
property bool haveAvatar: (account && account.core?.pictureUri || false) property bool haveAvatar: (account && account.core.pictureUri)
|| (contact && contact.core.pictureUri) || (contact && contact.core.pictureUri)
|| computedAvatarUri.length != 0 || computedAvatarUri.length != 0
property var avatarObj: UtilsCpp.findAvatarByAddress(_address) property var avatarObj: UtilsCpp.findAvatarByAddress(_address)
@ -75,7 +75,9 @@ Loader{
Connections{ Connections{
target: mainItem target: mainItem
onHaveAvatarChanged: function(haveAvatar) {stackView.replace(haveAvatar ? avatar : initials, StackView.Immediate)} onHaveAvatarChanged: {
console.log("have avatar changed", mainItem.haveAvatar, mainItem._address)
stackView.replace(mainItem.haveAvatar ? avatar : initials, StackView.Immediate)}
} }
Rectangle { Rectangle {
@ -198,9 +200,11 @@ Loader{
sourceSize.height: avatarItem.height sourceSize.height: avatarItem.height
fillMode: Image.PreserveAspectCrop fillMode: Image.PreserveAspectCrop
anchors.centerIn: parent anchors.centerIn: parent
source: mainItem.account && mainItem.account.core.pictureUri source: mainItem.account
|| mainItem.contact && mainItem.contact.core.pictureUri ? mainItem.account.core.pictureUri
|| computedAvatarUri : mainItem.contact
? mainItem.contact.core.pictureUri
: computedAvatarUri
mipmap: true mipmap: true
layer.enabled: true layer.enabled: true
} }