Rename bottomElementsHeight to baseElementsHeight

This commit is contained in:
miruka 2019-07-16 05:13:19 -04:00
parent d5dd1292ff
commit d302a5cf5f
7 changed files with 9 additions and 10 deletions

View File

@ -1,5 +1,4 @@
- Use childrenRect stuff - Use childrenRect stuff
- Rename theme.bottomElementsHeight
- Account delegate name color - Account delegate name color
- If avatar is set, name color from average color? - If avatar is set, name color from average color?
- normalSpacing in Theme - normalSpacing in Theme

View File

@ -8,7 +8,7 @@ import "../../Base"
HRectangle { HRectangle {
id: banner id: banner
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: theme.bottomElementsHeight Layout.preferredHeight: theme.baseElementsHeight
property alias avatar: bannerAvatar property alias avatar: bannerAvatar
property alias icon: bannerIcon property alias icon: bannerIcon

View File

@ -45,6 +45,6 @@ HColumnLayout {
backgroundColor: theme.sidePane.filterRooms.background backgroundColor: theme.sidePane.filterRooms.background
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: theme.bottomElementsHeight Layout.preferredHeight: theme.baseElementsHeight
} }
} }

View File

@ -10,7 +10,7 @@ HRectangle {
id: sendBox id: sendBox
Layout.fillWidth: true Layout.fillWidth: true
Layout.minimumHeight: theme.bottomElementsHeight Layout.minimumHeight: theme.baseElementsHeight
Layout.preferredHeight: textArea.implicitHeight Layout.preferredHeight: textArea.implicitHeight
// parent.height / 2 causes binding loop? // parent.height / 2 causes binding loop?
Layout.maximumHeight: pageStack.height / 2 Layout.maximumHeight: pageStack.height / 2

View File

@ -25,9 +25,9 @@ Page {
height: window.height < height: window.height <
avatarPreferredSize + avatarPreferredSize +
theme.bottomElementsHeight + theme.baseElementsHeight +
currentSpacing * 2 ? currentSpacing * 2 ?
0 : theme.bottomElementsHeight 0 : theme.baseElementsHeight
Behavior on height { HNumberAnimation {} } Behavior on height { HNumberAnimation {} }
visible: height > 0 visible: height > 0

View File

@ -10,7 +10,7 @@ HRowLayout {
property alias roomFilter: filterField.text property alias roomFilter: filterField.text
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: theme.bottomElementsHeight Layout.preferredHeight: theme.baseElementsHeight
HUIButton { HUIButton {
iconName: "settings" iconName: "settings"

View File

@ -11,6 +11,8 @@ QtObject {
property int minimumSupportedWidth: 240 property int minimumSupportedWidth: 240
property int minimumSupportedHeight: 120 property int minimumSupportedHeight: 120
property int baseElementsHeight: 36
property QtObject fontSize: QtObject { property QtObject fontSize: QtObject {
property int smallest: 6 property int smallest: 6
property int smaller: 8 property int smaller: 8
@ -134,7 +136,7 @@ QtObject {
} }
property QtObject avatar: QtObject { property QtObject avatar: QtObject {
property int size: 36 property int size: baseElementsHeight
property int radius: theme.radius property int radius: theme.radius
property color letter: "white" property color letter: "white"
@ -150,6 +152,4 @@ QtObject {
property real saturation: 0.32 property real saturation: 0.32
property real lightness: 0.3 property real lightness: 0.3
} }
property int bottomElementsHeight: 36
} }