fix(ChatMessagesView): Loading spinner and scroll to bottom button overlap
- remove the extra spinner (ok'ed by John and Benj) - use the more modern StatusIcon, w/o the unconditional ColorOverlay - some minor cleanup Closes: #7645
This commit is contained in:
parent
66f288ec97
commit
550b8fd04a
|
@ -168,19 +168,6 @@ ColumnLayout {
|
|||
+ chatInput.anchors.topMargin
|
||||
+ chatInput.anchors.bottomMargin
|
||||
|
||||
Loader {
|
||||
id: loadingMessagesIndicator
|
||||
active: root.rootStore.loadingHistoryMessagesInProgress
|
||||
visible: root.rootStore.loadingHistoryMessagesInProgress
|
||||
sourceComponent: LoadingAnimation { }
|
||||
anchors {
|
||||
right: parent.right
|
||||
bottom: chatInput.top
|
||||
rightMargin: Style.current.padding
|
||||
bottomMargin: Style.current.padding
|
||||
}
|
||||
}
|
||||
|
||||
StatusChatInput {
|
||||
id: chatInput
|
||||
|
||||
|
|
|
@ -213,22 +213,16 @@ Item {
|
|||
anchors.leftMargin: Style.current.halfPadding
|
||||
}
|
||||
|
||||
SVGImage {
|
||||
StatusIcon {
|
||||
id: arrowImage
|
||||
width: 24
|
||||
height: 24
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.left: nbMessages.right
|
||||
source: Style.svg("leave_chat")
|
||||
icon: "arrow-down"
|
||||
anchors.leftMargin: nbMessages.visible ? scrollDownButton.buttonPadding : 0
|
||||
rotation: -90
|
||||
|
||||
ColorOverlay {
|
||||
anchors.fill: parent
|
||||
source: parent
|
||||
color: Style.current.pillButtonTextColor
|
||||
}
|
||||
}
|
||||
|
||||
MouseArea {
|
||||
cursorShape: Qt.PointingHandCursor
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
import QtQuick 2.13
|
||||
import QtQuick.Controls 2.13
|
||||
import QtGraphicalEffects 1.13
|
||||
import QtQuick.Layouts 1.13
|
||||
import QtMultimedia 5.13
|
||||
import QtQuick.Dialogs 1.3
|
||||
import DotherSide 0.1
|
||||
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
import QtQuick 2.13
|
||||
import QtQuick.Controls 2.13
|
||||
import QtGraphicalEffects 1.13
|
||||
|
||||
import utils 1.0
|
||||
import shared 1.0
|
||||
import shared.panels 1.0
|
||||
|
||||
import StatusQ.Core 0.1
|
||||
import StatusQ.Core.Utils 0.1 as StatusQUtils
|
||||
|
||||
Rectangle {
|
||||
|
@ -108,18 +108,13 @@ Rectangle {
|
|||
anchors.topMargin: 4
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: 4
|
||||
contentItem: SVGImage {
|
||||
contentItem: StatusIcon {
|
||||
id: iconImg
|
||||
source: Style.svg("close")
|
||||
color: Style.current.textColor
|
||||
sourceSize: Qt.size(width, height)
|
||||
width: closeBtn.width
|
||||
height: closeBtn.height
|
||||
|
||||
ColorOverlay {
|
||||
anchors.fill: iconImg
|
||||
source: iconImg
|
||||
color: Style.current.textColor
|
||||
antialiasing: true
|
||||
}
|
||||
}
|
||||
background: Rectangle {
|
||||
color: "transparent"
|
||||
|
|
Loading…
Reference in New Issue