refactor: get rid off `AddButton` and make use of `StatusRoundButton` instead

This commit is contained in:
Pascal Precht 2020-11-16 14:15:39 +01:00 committed by Iuri Matias
parent 537ae7991b
commit 2aac433a3d
4 changed files with 20 additions and 22 deletions

View File

@ -3,6 +3,7 @@ import QtQuick.Controls 2.13
import QtQuick.Layouts 1.13 import QtQuick.Layouts 1.13
import "../../../../imports" import "../../../../imports"
import "../../../../shared" import "../../../../shared"
import "../../../../shared/status"
import "../../Chat/components" import "../../Chat/components"
import "./Contacts" import "./Contacts"
@ -26,12 +27,12 @@ Item {
width: addButton.width + usernameText.width + Style.current.padding width: addButton.width + usernameText.width + Style.current.padding
height: addButton.height height: addButton.height
AddButton {
StatusRoundButton {
id: addButton id: addButton
clickable: false icon.name: "plusSign"
size: "medium"
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
width: 40
height: 40
} }
StyledText { StyledText {

View File

@ -3,6 +3,7 @@ import QtQuick.Layouts 1.3
import QtQuick.Controls 2.14 import QtQuick.Controls 2.14
import "../../../../../imports" import "../../../../../imports"
import "../../../../../shared" import "../../../../../shared"
import "../../../../../shared/status"
import "../../../Chat/ChatColumn/MessageComponents" import "../../../Chat/ChatColumn/MessageComponents"
Item { Item {
@ -127,12 +128,11 @@ Item {
width: addButton.width + usernameText.width + Style.current.padding width: addButton.width + usernameText.width + Style.current.padding
height: addButton.height height: addButton.height
AddButton { StatusRoundButton {
id: addButton id: addButton
clickable: false icon.name: "plusSign"
size: "medium"
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
width: 40
height: 40
} }
StyledText { StyledText {

View File

@ -1,12 +1,20 @@
import QtQuick 2.13 import QtQuick 2.13
import QtQuick.Controls 2.13 import QtQuick.Controls 2.13
import "../../../../shared" import "../../../../shared"
import "../../../../shared/status"
import "../../../../imports" import "../../../../imports"
AddButton { StatusRoundButton {
id: btnAdd id: btnAdd
icon.name: "plusSign"
pressedIconRotation: 45
size: "medium"
width: 36
height: 36
onClicked: { onClicked: {
let x = btnAdd.iconImg.x + btnAdd.icon.width / 2 - newAccountMenu.width / 2 btnAdd.state = "pressed"
let x = btnAdd.iconX + btnAdd.icon.width / 2 - newAccountMenu.width / 2
newAccountMenu.popup(x, btnAdd.icon.height + 10) newAccountMenu.popup(x, btnAdd.icon.height + 10)
} }
@ -59,7 +67,7 @@ AddButton {
} }
} }
onAboutToHide: { onAboutToHide: {
btnAdd.iconImg.state = "default" btnAdd.state = "default"
} }
} }
} }

View File

@ -1,11 +0,0 @@
import QtQuick 2.3
import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import Qt.labs.platform 1.1
import "../imports"
import "./"
IconButton {
id: iconButton
iconName: "plusSign"
}