force larger text metrics weight to guarantee correct width for button
fix macos ci + update sdk
This commit is contained in:
parent
d682cf1b8a
commit
2feb741c1b
5 changed files with 18 additions and 9 deletions
|
|
@ -1220,7 +1220,7 @@
|
||||||
<location filename="../../view/Page/Window/Call/CallsWindow.qml" line="369"/>
|
<location filename="../../view/Page/Window/Call/CallsWindow.qml" line="369"/>
|
||||||
<source>call_paused_by_remote</source>
|
<source>call_paused_by_remote</source>
|
||||||
<extracomment>Call paused by remote</extracomment>
|
<extracomment>Call paused by remote</extracomment>
|
||||||
<translation type="unfinished">Call paused by remote</translation>
|
<translation>Call paused by remote</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Window/Call/CallsWindow.qml" line="567"/>
|
<location filename="../../view/Page/Window/Call/CallsWindow.qml" line="567"/>
|
||||||
|
|
|
||||||
|
|
@ -1024,7 +1024,7 @@
|
||||||
<location filename="../../view/Page/Main/Call/CallPage.qml" line="566"/>
|
<location filename="../../view/Page/Main/Call/CallPage.qml" line="566"/>
|
||||||
<source>sip_address_copied_to_clipboard_message</source>
|
<source>sip_address_copied_to_clipboard_message</source>
|
||||||
<extracomment>L'adresse a été copié dans le presse_papiers</extracomment>
|
<extracomment>L'adresse a été copié dans le presse_papiers</extracomment>
|
||||||
<translation>L'adresse a été copié dans le presse_papiers</translation>
|
<translation>L'adresse a été copié dans le presse-papiers</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Main/Call/CallPage.qml" line="572"/>
|
<location filename="../../view/Page/Main/Call/CallPage.qml" line="572"/>
|
||||||
|
|
@ -1220,7 +1220,7 @@
|
||||||
<location filename="../../view/Page/Window/Call/CallsWindow.qml" line="369"/>
|
<location filename="../../view/Page/Window/Call/CallsWindow.qml" line="369"/>
|
||||||
<source>call_paused_by_remote</source>
|
<source>call_paused_by_remote</source>
|
||||||
<extracomment>Call paused by remote</extracomment>
|
<extracomment>Call paused by remote</extracomment>
|
||||||
<translation type="unfinished">Appel mis en pause par votre correspondant</translation>
|
<translation>Appel mis en pause par votre correspondant</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../../view/Page/Window/Call/CallsWindow.qml" line="567"/>
|
<location filename="../../view/Page/Window/Call/CallsWindow.qml" line="567"/>
|
||||||
|
|
|
||||||
|
|
@ -47,12 +47,19 @@ Button {
|
||||||
family: DefaultStyle.defaultFont
|
family: DefaultStyle.defaultFont
|
||||||
capitalization: mainItem.capitalization
|
capitalization: mainItem.capitalization
|
||||||
underline: mainItem.underline
|
underline: mainItem.underline
|
||||||
bold: mainItem.style === ButtonStyle.noBackground && (mainItem.hovered || mainItem.pressed)
|
bold: (mainItem.style === ButtonStyle.noBackground || mainItem.style === ButtonStyle.noBackgroundRed) && (mainItem.hovered || mainItem.pressed)
|
||||||
}
|
}
|
||||||
TextMetrics {
|
}
|
||||||
id: textMetrics
|
TextMetrics {
|
||||||
text: mainItem.text
|
id: textMetrics
|
||||||
font: textItem.font
|
text: mainItem.text
|
||||||
|
font {
|
||||||
|
pixelSize: mainItem.textSize
|
||||||
|
weight: mainItem.textWeight * 2
|
||||||
|
family: DefaultStyle.defaultFont
|
||||||
|
capitalization: mainItem.capitalization
|
||||||
|
underline: mainItem.underline
|
||||||
|
bold: true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Item {Layout.fillWidth: true}
|
Item {Layout.fillWidth: true}
|
||||||
|
|
|
||||||
|
|
@ -182,6 +182,7 @@ FocusScope {
|
||||||
|
|
||||||
popup.contentItem: ColumnLayout {
|
popup.contentItem: ColumnLayout {
|
||||||
IconLabelButton {
|
IconLabelButton {
|
||||||
|
Layout.fillWidth: true
|
||||||
visible: searchResultItem.core.isStored
|
visible: searchResultItem.core.isStored
|
||||||
&& !searchResultItem.core.readOnly
|
&& !searchResultItem.core.readOnly
|
||||||
//: "Enlever des favoris"
|
//: "Enlever des favoris"
|
||||||
|
|
@ -202,6 +203,7 @@ FocusScope {
|
||||||
}
|
}
|
||||||
IconLabelButton {
|
IconLabelButton {
|
||||||
text: qsTr("Partager")
|
text: qsTr("Partager")
|
||||||
|
Layout.fillWidth: true
|
||||||
icon.source: AppIcons.shareNetwork
|
icon.source: AppIcons.shareNetwork
|
||||||
spacing: Math.round(10 * DefaultStyle.dp)
|
spacing: Math.round(10 * DefaultStyle.dp)
|
||||||
textColor: DefaultStyle.main2_500main
|
textColor: DefaultStyle.main2_500main
|
||||||
|
|
@ -233,6 +235,7 @@ FocusScope {
|
||||||
icon.source: AppIcons.trashCan
|
icon.source: AppIcons.trashCan
|
||||||
spacing: Math.round(10 * DefaultStyle.dp)
|
spacing: Math.round(10 * DefaultStyle.dp)
|
||||||
visible: !searchResultItem.core.readOnly
|
visible: !searchResultItem.core.readOnly
|
||||||
|
Layout.fillWidth: true
|
||||||
onClicked: {
|
onClicked: {
|
||||||
mainItem.contactDeletionRequested(
|
mainItem.contactDeletionRequested(
|
||||||
searchResultItem)
|
searchResultItem)
|
||||||
|
|
|
||||||
|
|
@ -754,7 +754,6 @@ FriendGui{
|
||||||
//: "Autres actions"
|
//: "Autres actions"
|
||||||
label: qsTr("contact_details_actions_title")
|
label: qsTr("contact_details_actions_title")
|
||||||
content: ColumnLayout {
|
content: ColumnLayout {
|
||||||
width: parent.width
|
|
||||||
IconLabelButton {
|
IconLabelButton {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.preferredHeight: Math.round(50 * DefaultStyle.dp)
|
Layout.preferredHeight: Math.round(50 * DefaultStyle.dp)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue