status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: fix tab bar buttons still having a margin when invisible

This commit is contained in:
Jonathan Rainville 2020-10-30 15:40:53 -04:00 committed by Iuri Matias
parent 1122b33ff8
commit 53b0c74fd2
2 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ui/app/AppMain.qml
View File

@ -64,6 +64,7 @@ RowLayout {
id: chatBtn id: chatBtn
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
icon.name: "message" icon.name: "message"
anchors.topMargin: 0
Rectangle { Rectangle {
visible: chatsModel.unreadMessagesCount > 0 visible: chatsModel.unreadMessagesCount > 0
@ -88,30 +89,20 @@ RowLayout {
StatusIconTabButton { StatusIconTabButton {
id: walletBtn id: walletBtn
anchors.top: chatBtn.top anchors.top: chatBtn.top
anchors.topMargin: 50
anchors.horizontalCenter: parent.horizontalCenter
enabled: isExperimental === "1" || appSettings.walletEnabled enabled: isExperimental === "1" || appSettings.walletEnabled
visible: this.enabled
height: this.enabled ? 40 : 0
icon.name: "wallet" icon.name: "wallet"
} }
StatusIconTabButton { StatusIconTabButton {
id: browserBtn id: browserBtn
anchors.top: walletBtn.top anchors.top: walletBtn.top
anchors.topMargin: 50
anchors.horizontalCenter: parent.horizontalCenter
enabled: isExperimental === "1" || appSettings.browserEnabled enabled: isExperimental === "1" || appSettings.browserEnabled
visible: this.enabled
height: this.enabled ? 40 : 0
icon.name: "compass" icon.name: "compass"
} }
StatusIconTabButton { StatusIconTabButton {
id: profileBtn id: profileBtn
anchors.top: browserBtn.top anchors.top: browserBtn.top
anchors.topMargin: 50
anchors.horizontalCenter: parent.horizontalCenter
icon.name: "profile" icon.name: "profile"
Rectangle { Rectangle {
@ -137,22 +128,14 @@ RowLayout {
StatusIconTabButton { StatusIconTabButton {
id: nodeBtn id: nodeBtn
enabled: isExperimental === "1" enabled: isExperimental === "1"
visible: this.enabled
height: this.enabled ? 40 : 0
anchors.top: profileBtn.top anchors.top: profileBtn.top
anchors.topMargin: 50
anchors.horizontalCenter: parent.horizontalCenter
icon.name: "node" icon.name: "node"
} }
StatusIconTabButton { StatusIconTabButton {
id: uiComponentBtn id: uiComponentBtn
enabled: isExperimental === "1" enabled: isExperimental === "1"
visible: this.enabled
height: this.enabled ? 40 : 0
anchors.top: nodeBtn.top anchors.top: nodeBtn.top
anchors.topMargin: 50
anchors.horizontalCenter: parent.horizontalCenter
icon.name: "node" icon.name: "node"
} }
} }

5
ui/shared/status/StatusIconTabButton.qml
View File

@ -7,8 +7,11 @@ import "../../shared/status"
TabButton { TabButton {
id: control id: control
visible: enabled
width: 40 width: 40
height: 40 height: enabled ? 40 : 0
anchors.topMargin: enabled ? 50 : 0
anchors.horizontalCenter: parent.horizontalCenter
property color iconColor: Style.current.secondaryText property color iconColor: Style.current.secondaryText
property color disabledColor: iconColor property color disabledColor: iconColor
property int iconRotation: 0 property int iconRotation: 0