mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-01-26 00:08:13 +00:00
fix #LINQT-1551 tabbar text size
fix #LINQT-1552 do not show validation toast in conf fix #LINQT-1554 micro muted icon for user
This commit is contained in:
parent
549866b48f
commit
cde6bc0788
8 changed files with 25 additions and 11 deletions
|
|
@ -81,7 +81,7 @@ Control.Button {
|
|||
// color: buttonBackground.color == "transparent" ? "transparent" : "white"
|
||||
color: disabledFilterColor
|
||||
opacity: 0.5
|
||||
visible: !mainItem.enabled && mainItem.color != "transparent"
|
||||
visible: !mainItem.enabled && mainItem.color.a !== 0
|
||||
radius: mainItem.radius
|
||||
width: mainItem.width
|
||||
height: mainItem.height
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ Control.TabBar {
|
|||
height: visible && buttonIcon.isImageReady ? undefined : 0
|
||||
bottomInset: 32 * DefaultStyle.dp
|
||||
topInset: 32 * DefaultStyle.dp
|
||||
|
||||
hoverEnabled: true
|
||||
visible: modelData?.visible != undefined ? modelData?.visible : true
|
||||
UnreadNotification {
|
||||
unread: !defaultAccount
|
||||
|
|
@ -106,12 +106,15 @@ Control.TabBar {
|
|||
anchors.rightMargin: 15 * DefaultStyle.dp
|
||||
anchors.top: parent.top
|
||||
}
|
||||
MouseArea {
|
||||
anchors.fill: tabButton
|
||||
cursorShape: tabButton.hovered ? Qt.PointingHandCursor : Qt.ArrowCursor
|
||||
acceptedButtons: Qt.NoButton
|
||||
}
|
||||
contentItem: ColumnLayout {
|
||||
// height: tabButton.height
|
||||
// width: tabButton.width
|
||||
EffectImage {
|
||||
id: buttonIcon
|
||||
property int buttonSize: 24 * DefaultStyle.dp
|
||||
property int buttonSize: mainItem.currentIndex !== index && tabButton.hovered ? 26 * DefaultStyle.dp : 24 * DefaultStyle.dp
|
||||
imageSource: mainItem.currentIndex === index ? modelData.selectedIcon : modelData.icon
|
||||
Layout.preferredWidth: buttonSize
|
||||
Layout.preferredHeight: buttonSize
|
||||
|
|
@ -125,10 +128,12 @@ Control.TabBar {
|
|||
visible: buttonIcon.isImageReady
|
||||
text: modelData.label
|
||||
font {
|
||||
weight: mainItem.currentIndex === index ? 800 * DefaultStyle.dp : 400 * DefaultStyle.dp
|
||||
pixelSize: 9 * DefaultStyle.dp
|
||||
underline: tabButton.activeFocus || tabButton.hovered
|
||||
bold: true
|
||||
weight: mainItem.currentIndex === index
|
||||
? 800 * DefaultStyle.dp
|
||||
: tabButton.hovered
|
||||
? 600 * DefaultStyle.dp
|
||||
: 400 * DefaultStyle.dp
|
||||
pixelSize: 11 * DefaultStyle.dp
|
||||
}
|
||||
color: DefaultStyle.grey_0
|
||||
Layout.fillWidth: true
|
||||
|
|
|
|||
|
|
@ -57,7 +57,11 @@ Item {
|
|||
|| (participantDevice && participantDevice.core.videoEnabled)
|
||||
property string qmlName
|
||||
property bool displayAll : !!mainItem.call
|
||||
property bool mutedStatus: participantDevice ? participantDevice.core.isMuted : false
|
||||
property bool mutedStatus: participantDevice
|
||||
? participantDevice.core.isMuted
|
||||
: account && call
|
||||
? call.core.conference && call.core.microphoneMuted
|
||||
: false
|
||||
clip: false
|
||||
Rectangle {
|
||||
id: background
|
||||
|
|
|
|||
|
|
@ -2,7 +2,8 @@ import QtQuick
|
|||
import QtQuick.Controls.Basic as Control
|
||||
import QtQuick.Layouts
|
||||
import Linphone
|
||||
|
||||
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||
|
||||
Control.TextField {
|
||||
id: mainItem
|
||||
property var customWidth
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ import QtQuick
|
|||
import QtQuick.Layouts
|
||||
import QtQuick.Controls.Basic
|
||||
import Linphone
|
||||
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||
|
||||
Popup {
|
||||
id: mainItem
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ import QtQuick.Layouts
|
|||
import Linphone
|
||||
import UtilsCpp
|
||||
import SettingsCpp
|
||||
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||
|
||||
MainRightPanel {
|
||||
id: mainItem
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import QtQuick.Controls.Basic as Control
|
|||
import Linphone
|
||||
import UtilsCpp
|
||||
import SettingsCpp
|
||||
import 'qrc:/qt/qml/Linphone/view/Style/buttonStyle.js' as ButtonStyle
|
||||
|
||||
FocusScope{
|
||||
id: mainItem
|
||||
|
|
|
|||
|
|
@ -239,6 +239,7 @@ AbstractWindow {
|
|||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
clip: true
|
||||
function open() {
|
||||
if (mainItem.isConference) return
|
||||
y = headerItem.height/2
|
||||
autoCloseZrtpToast.restart()
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue