Rename HHighlightRectangle → HInteractiveRectangle
This commit is contained in:
parent
d8295302a5
commit
44a998f31b
1
TODO.md
1
TODO.md
|
@ -1,4 +1,3 @@
|
||||||
- HTextField focus effect
|
|
||||||
- Devices and client settings in edit account page
|
- Devices and client settings in edit account page
|
||||||
- If avatar is set, name color from average color?
|
- If avatar is set, name color from average color?
|
||||||
- Accent color from background
|
- Accent color from background
|
||||||
|
|
|
@ -7,10 +7,12 @@ HRectangle {
|
||||||
property bool checkable: false // TODO
|
property bool checkable: false // TODO
|
||||||
property bool checked: false
|
property bool checked: false
|
||||||
|
|
||||||
property color normalColor: theme.controls.listEntry.background
|
readonly property QtObject _ir: theme.controls.interactiveRectangle
|
||||||
property color hoveredColor: theme.controls.listEntry.hoveredBackground
|
|
||||||
property color pressedColor: theme.controls.listEntry.pressedBackground
|
property color normalColor: _ir.background
|
||||||
property color checkedColor: theme.controls.listEntry.checkedBackground
|
property color hoveredColor: _ir.hoveredBackground
|
||||||
|
property color pressedColor: _ir.pressedBackground
|
||||||
|
property color checkedColor: _ir.checkedBackground
|
||||||
|
|
||||||
color: checked ? checkedColor :
|
color: checked ? checkedColor :
|
||||||
// tap.pressed ? pressedColor :
|
// tap.pressed ? pressedColor :
|
|
@ -5,7 +5,7 @@ import QtQuick 2.12
|
||||||
import QtQuick.Layouts 1.12
|
import QtQuick.Layouts 1.12
|
||||||
import "../../Base"
|
import "../../Base"
|
||||||
|
|
||||||
HHighlightRectangle {
|
HInteractiveRectangle {
|
||||||
id: memberDelegate
|
id: memberDelegate
|
||||||
width: memberList.width
|
width: memberList.width
|
||||||
height: childrenRect.height
|
height: childrenRect.height
|
||||||
|
|
|
@ -12,7 +12,7 @@ Column {
|
||||||
property var userInfo: users.find(model.userId)
|
property var userInfo: users.find(model.userId)
|
||||||
property bool expanded: true
|
property bool expanded: true
|
||||||
|
|
||||||
HHighlightRectangle {
|
HInteractiveRectangle {
|
||||||
width: parent.width
|
width: parent.width
|
||||||
height: childrenRect.height
|
height: childrenRect.height
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ import QtQuick.Layouts 1.12
|
||||||
import "../Base"
|
import "../Base"
|
||||||
import "../utils.js" as Utils
|
import "../utils.js" as Utils
|
||||||
|
|
||||||
HHighlightRectangle {
|
HInteractiveRectangle {
|
||||||
id: roomDelegate
|
id: roomDelegate
|
||||||
width: roomList.width
|
width: roomList.width
|
||||||
height: childrenRect.height
|
height: childrenRect.height
|
||||||
|
|
|
@ -53,7 +53,7 @@ QtObject {
|
||||||
property color background: colors.background2
|
property color background: colors.background2
|
||||||
}
|
}
|
||||||
|
|
||||||
property QtObject listEntry: QtObject {
|
property QtObject interactiveRectangle: QtObject {
|
||||||
property color background: "transparent"
|
property color background: "transparent"
|
||||||
property color hoveredBackground: Ut.hsla(0, 0, 0, 0.2)
|
property color hoveredBackground: Ut.hsla(0, 0, 0, 0.2)
|
||||||
property color pressedBackground: Ut.hsla(0, 0, 0, 0.4)
|
property color pressedBackground: Ut.hsla(0, 0, 0, 0.4)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user