mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-01-17 03:18:07 +00:00
fix #LINQT-1904 last message imdn
This commit is contained in:
parent
54eac3ddc1
commit
5e09348c3d
3 changed files with 34 additions and 16 deletions
|
|
@ -9,9 +9,6 @@ Button {
|
||||||
textSize: Typography.p1s.pixelSize
|
textSize: Typography.p1s.pixelSize
|
||||||
textWeight: Typography.p1s.weight
|
textWeight: Typography.p1s.weight
|
||||||
padding: Math.round(16 * DefaultStyle.dp)
|
padding: Math.round(16 * DefaultStyle.dp)
|
||||||
// bottomPadding: Math.round(16 * DefaultStyle.dp)
|
|
||||||
// leftPadding: Math.round(16 * DefaultStyle.dp)
|
|
||||||
// rightPadding: Math.round(16 * DefaultStyle.dp)
|
|
||||||
// icon.width: width
|
// icon.width: width
|
||||||
// icon.height: width
|
// icon.height: width
|
||||||
radius: width * 2
|
radius: width * 2
|
||||||
|
|
|
||||||
|
|
@ -322,8 +322,8 @@ ListView {
|
||||||
unread: modelData?.core.unreadMessagesCount || false
|
unread: modelData?.core.unreadMessagesCount || false
|
||||||
}
|
}
|
||||||
EffectImage {
|
EffectImage {
|
||||||
visible: modelData?.core.lastMessage && modelData?.core.lastMessageState !== LinphoneEnums.ChatMessageState.StateIdle || false
|
visible: modelData?.core.lastMessage && modelData?.core.lastMessageState !== LinphoneEnums.ChatMessageState.StateIdle
|
||||||
&& !modelData.core.lastMessage.core.isRemoteMessage
|
&& !modelData.core.lastMessage.core.isRemoteMessage || false
|
||||||
Layout.preferredWidth: visible ? 14 * DefaultStyle.dp : 0
|
Layout.preferredWidth: visible ? 14 * DefaultStyle.dp : 0
|
||||||
Layout.preferredHeight: 14 * DefaultStyle.dp
|
Layout.preferredHeight: 14 * DefaultStyle.dp
|
||||||
colorizationColor: DefaultStyle.main1_500_main
|
colorizationColor: DefaultStyle.main1_500_main
|
||||||
|
|
|
||||||
|
|
@ -123,15 +123,30 @@ AbstractMainPage {
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
Item {
|
Control.ScrollView {
|
||||||
id: overridenRightPanel
|
id: overridenRightPanel
|
||||||
|
width: Math.round((393 + 10) * DefaultStyle.dp)
|
||||||
|
anchors.top: parent.top
|
||||||
|
anchors.bottom: parent.bottom
|
||||||
|
anchors.topMargin: Math.round(58 * DefaultStyle.dp)
|
||||||
|
anchors.bottomMargin: Math.round(30 * DefaultStyle.dp)
|
||||||
|
height: parent.height - anchors.topMargin
|
||||||
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
|
contentHeight: overridenRightPanelStackView.currentItem.childrenRect.height
|
||||||
|
contentWidth: width
|
||||||
|
clip: true
|
||||||
|
Control.ScrollBar.vertical: ScrollBar {
|
||||||
|
visible: overridenRightPanel.contentHeight > overridenRightPanel.height
|
||||||
|
anchors.top: parent.top
|
||||||
|
anchors.bottom: parent.bottom
|
||||||
|
anchors.right: parent.right
|
||||||
|
}
|
||||||
Control.StackView {
|
Control.StackView {
|
||||||
id: overridenRightPanelStackView
|
id: overridenRightPanelStackView
|
||||||
width: Math.round(393 * DefaultStyle.dp)
|
anchors.fill: parent
|
||||||
height: parent.height
|
anchors.rightMargin: Math.round(10 * DefaultStyle.dp)
|
||||||
anchors.top: parent.top
|
height: currentItem ? currentItem.height : 0
|
||||||
anchors.centerIn: parent
|
width: Math.round(393 * DefaultStyle.dp)
|
||||||
anchors.horizontalCenter: parent.horiztonalCenter
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -149,9 +164,11 @@ AbstractMainPage {
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
spacing: 0
|
spacing: 0
|
||||||
RowLayout {
|
RowLayout {
|
||||||
Layout.rightMargin: Math.round(38 * DefaultStyle.dp)
|
Layout.rightMargin: Math.round(38 * DefaultStyle.dp)
|
||||||
|
Layout.alignment: Qt.AlignTop
|
||||||
|
Layout.fillWidth: true
|
||||||
spacing: 0
|
spacing: 0
|
||||||
Text {
|
Text {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|
@ -373,10 +390,9 @@ AbstractMainPage {
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.topMargin: Math.round(58 * DefaultStyle.dp)
|
|
||||||
spacing: 0
|
spacing: 0
|
||||||
Section {
|
Section {
|
||||||
Layout.preferredWidth: Math.round(393 * DefaultStyle.dp)
|
Layout.fillWidth: true
|
||||||
content: RowLayout {
|
content: RowLayout {
|
||||||
spacing: Math.round(16 * DefaultStyle.dp)
|
spacing: Math.round(16 * DefaultStyle.dp)
|
||||||
Layout.preferredWidth: overridenRightPanelStackView.width
|
Layout.preferredWidth: overridenRightPanelStackView.width
|
||||||
|
|
@ -574,13 +590,12 @@ AbstractMainPage {
|
||||||
id: meetingDetail
|
id: meetingDetail
|
||||||
FocusScope{
|
FocusScope{
|
||||||
width: overridenRightPanelStackView.width
|
width: overridenRightPanelStackView.width
|
||||||
height: meetingDetailsLayout.implicitHeight
|
height: meetingDetailsLayout.childrenRect.height
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
id: meetingDetailsLayout
|
id: meetingDetailsLayout
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.topMargin: Math.round(58 * DefaultStyle.dp)
|
|
||||||
visible: mainItem.selectedConference
|
visible: mainItem.selectedConference
|
||||||
spacing: Math.round(25 * DefaultStyle.dp)
|
spacing: Math.round(25 * DefaultStyle.dp)
|
||||||
Section {
|
Section {
|
||||||
|
|
@ -616,6 +631,7 @@ AbstractMainPage {
|
||||||
KeyNavigation.right: deletePopup
|
KeyNavigation.right: deletePopup
|
||||||
KeyNavigation.up: joinButton
|
KeyNavigation.up: joinButton
|
||||||
KeyNavigation.down: shareNetworkButton
|
KeyNavigation.down: shareNetworkButton
|
||||||
|
Layout.preferredWidth: Math.round(24 * DefaultStyle.dp)
|
||||||
onClicked: mainItem.editConference(mainItem.selectedConference)
|
onClicked: mainItem.editConference(mainItem.selectedConference)
|
||||||
}
|
}
|
||||||
PopupButton {
|
PopupButton {
|
||||||
|
|
@ -701,6 +717,7 @@ AbstractMainPage {
|
||||||
KeyNavigation.right: linkButton
|
KeyNavigation.right: linkButton
|
||||||
KeyNavigation.up: deletePopup
|
KeyNavigation.up: deletePopup
|
||||||
KeyNavigation.down: joinButton
|
KeyNavigation.down: joinButton
|
||||||
|
Layout.preferredWidth: Math.round(24 * DefaultStyle.dp)
|
||||||
onClicked: {
|
onClicked: {
|
||||||
var success = UtilsCpp.copyToClipboard(mainItem.selectedConference.core.uri)
|
var success = UtilsCpp.copyToClipboard(mainItem.selectedConference.core.uri)
|
||||||
if (success) UtilsCpp.showInformationPopup(qsTr("saved"),
|
if (success) UtilsCpp.showInformationPopup(qsTr("saved"),
|
||||||
|
|
@ -739,6 +756,7 @@ AbstractMainPage {
|
||||||
colorizationColor: DefaultStyle.main2_600
|
colorizationColor: DefaultStyle.main2_600
|
||||||
}
|
}
|
||||||
Text {
|
Text {
|
||||||
|
Layout.fillWidth: true
|
||||||
//: "Fuseau horaire"
|
//: "Fuseau horaire"
|
||||||
text: "%1: %2".arg(qsTr("meeting_schedule_timezone_title")).arg(mainItem.selectedConference && mainItem.selectedConference.core ? (mainItem.selectedConference.core.timeZoneModel.displayName + ", " + mainItem.selectedConference.core.timeZoneModel.countryName) : "")
|
text: "%1: %2".arg(qsTr("meeting_schedule_timezone_title")).arg(mainItem.selectedConference && mainItem.selectedConference.core ? (mainItem.selectedConference.core.timeZoneModel.displayName + ", " + mainItem.selectedConference.core.timeZoneModel.countryName) : "")
|
||||||
font {
|
font {
|
||||||
|
|
@ -795,6 +813,7 @@ AbstractMainPage {
|
||||||
}
|
}
|
||||||
Section {
|
Section {
|
||||||
visible: participantList.count > 0
|
visible: participantList.count > 0
|
||||||
|
Layout.fillWidth: true
|
||||||
content: RowLayout {
|
content: RowLayout {
|
||||||
Layout.preferredHeight: participantList.height
|
Layout.preferredHeight: participantList.height
|
||||||
width: Math.round(393 * DefaultStyle.dp)
|
width: Math.round(393 * DefaultStyle.dp)
|
||||||
|
|
@ -851,6 +870,8 @@ AbstractMainPage {
|
||||||
id: joinButton
|
id: joinButton
|
||||||
visible: mainItem.selectedConference && mainItem.selectedConference.core?.state !== LinphoneEnums.ConferenceInfoState.Cancelled
|
visible: mainItem.selectedConference && mainItem.selectedConference.core?.state !== LinphoneEnums.ConferenceInfoState.Cancelled
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
Layout.preferredHeight: implicitHeight
|
||||||
|
Layout.bottomMargin: Math.round(5 * DefaultStyle.dp)
|
||||||
//: "Rejoindre la réunion"
|
//: "Rejoindre la réunion"
|
||||||
text: qsTr("meeting_info_join_title")
|
text: qsTr("meeting_info_join_title")
|
||||||
focus: true
|
focus: true
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue