CyberOS
/
cyber-calculator
3
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

MeuiKit API Update

master
omame 2021-05-25 19:37:59 +02:00
parent 78bf346e93
commit c99083e143
Signed by: omame
GPG Key ID: B8B8157B11168D28
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qml/ButtonsView.qml
View File

@ -33,19 +33,19 @@ Item {
Rectangle {
anchors.centerIn: parent
radius: Meui.Theme.smallRadius
radius: Meui.Units.smallRadius
width: parent.width - radius
height: parent.height - radius
color: buttonRect.pressed ?
Meui.Theme.highlightColor
: buttonRect.containsMouse ?
Meui.Theme.darkMode ?
Qt.lighter(Meui.Theme.backgroundColor, 1.25)
: Qt.darker(Meui.Theme.backgroundColor, 1.1)
: Meui.Theme.backgroundColor
Qt.lighter(Meui.Theme.primaryBackgroundColor, 1.25)
: Qt.darker(Meui.Theme.primaryBackgroundColor, 1.1)
: Meui.Theme.primaryBackgroundColor
border.width: 1
border.color: Meui.Theme.darkMode ? Qt.lighter(Meui.Theme.backgroundColor, 1.1) : Qt.darker(Meui.Theme.backgroundColor, 1.1)
border.color: Meui.Theme.darkMode ? Qt.lighter(Meui.Theme.primaryBackgroundColor, 1.1) : Qt.darker(Meui.Theme.primaryBackgroundColor, 1.1)
Behavior on color {
ColorAnimation {

10
qml/MemoryButtonsView.qml
View File

@ -33,19 +33,19 @@ Item {
Rectangle {
anchors.centerIn: parent
radius: Meui.Theme.smallRadius
radius: Meui.Units.smallRadius
width: parent.width - radius
height: parent.height - radius
color: buttonRect.pressed ?
Meui.Theme.highlightColor
: buttonRect.containsMouse ?
Meui.Theme.darkMode ?
Qt.lighter(Meui.Theme.backgroundColor, 1.25)
: Qt.darker(Meui.Theme.backgroundColor, 1.1)
: Meui.Theme.backgroundColor
Qt.lighter(Meui.Theme.secondaryBackgroundColor, 1.25)
: Qt.darker(Meui.Theme.secondaryBackgroundColor, 1.1)
: Meui.Theme.secondaryBackgroundColor
border.width: 1
border.color: Meui.Theme.darkMode ? Qt.lighter(Meui.Theme.backgroundColor, 1.1) : Qt.darker(Meui.Theme.backgroundColor, 1.1)
border.color: Meui.Theme.darkMode ? Qt.lighter(Meui.Theme.secondaryBackgroundColor, 1.1) : Qt.darker(Meui.Theme.secondaryBackgroundColor, 1.1)
Behavior on color {
ColorAnimation {

6
qml/main.qml
View File

@ -13,7 +13,7 @@ Meui.Window {
title: qsTr("Calculator")
id: rootWindow
backgroundColor: Meui.Theme.secondBackgroundColor
backgroundColor: Meui.Theme.tertiaryBackgroundColor
headerBar: Rectangle {
color: "transparent"
@ -22,9 +22,7 @@ Meui.Window {
Label {
text: rootWindow.title
// TODO: Make this a separate variable in Meui.Theme,
// maybe Meui.Theme.titleBarTextColor?
color: Meui.Theme.darkMode ? "#cacbce" : "#383838"
color: Meui.Theme.titleBarTextColor
anchors.fill: parent
horizontalAlignment: Text.AlignHCenter
}