formatting
This commit is contained in:
parent
73c7ba8cdc
commit
4b161facca
8 changed files with 10 additions and 11 deletions
|
|
@ -369,9 +369,8 @@ NLoader {
|
||||||
height: 56 * scaling
|
height: 56 * scaling
|
||||||
radius: 16 * scaling
|
radius: 16 * scaling
|
||||||
property bool isSelected: index === selectedIndex
|
property bool isSelected: index === selectedIndex
|
||||||
color: (appCardArea.containsMouse || isSelected) ? Qt.darker(
|
color: (appCardArea.containsMouse || isSelected) ? Qt.darker(Colors.colorPrimary,
|
||||||
Colors.colorPrimary,
|
1.1) : Colors.colorSurface
|
||||||
1.1) : Colors.colorSurface
|
|
||||||
border.color: (appCardArea.containsMouse
|
border.color: (appCardArea.containsMouse
|
||||||
|| isSelected) ? Colors.colorPrimary : "transparent"
|
|| isSelected) ? Colors.colorPrimary : "transparent"
|
||||||
border.width: (appCardArea.containsMouse || isSelected) ? 2 : 0
|
border.width: (appCardArea.containsMouse || isSelected) ? 2 : 0
|
||||||
|
|
|
||||||
|
|
@ -631,7 +631,8 @@ WlSessionLock {
|
||||||
width: 64 * Scaling.scale(screen)
|
width: 64 * Scaling.scale(screen)
|
||||||
height: 64 * Scaling.scale(screen)
|
height: 64 * Scaling.scale(screen)
|
||||||
radius: 32
|
radius: 32
|
||||||
color: Qt.rgba(Colors.colorError.r, Colors.colorError.g, Colors.colorError.b, shutdownArea.containsMouse ? 0.9 : 0.2)
|
color: Qt.rgba(Colors.colorError.r, Colors.colorError.g, Colors.colorError.b,
|
||||||
|
shutdownArea.containsMouse ? 0.9 : 0.2)
|
||||||
border.color: Colors.colorError
|
border.color: Colors.colorError
|
||||||
border.width: 2 * Scaling.scale(screen)
|
border.width: 2 * Scaling.scale(screen)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -254,7 +254,6 @@ NLoader {
|
||||||
"wght": (Font.Normal + Font.Bold) / 2.0
|
"wght": (Font.Normal + Font.Bold) / 2.0
|
||||||
}
|
}
|
||||||
font.pointSize: Style.fontSizeLarge * scaling
|
font.pointSize: Style.fontSizeLarge * scaling
|
||||||
|
|
||||||
}
|
}
|
||||||
// Tab label on the left side
|
// Tab label on the left side
|
||||||
NText {
|
NText {
|
||||||
|
|
|
||||||
|
|
@ -112,7 +112,7 @@ NBox {
|
||||||
return `${max}°/${min}°`
|
return `${max}°/${min}°`
|
||||||
}
|
}
|
||||||
font.pointSize: Style.fontSizeSmall * scaling
|
font.pointSize: Style.fontSizeSmall * scaling
|
||||||
color: Colors.colorOnSurfaceVariant
|
color: Colors.colorOnSurfaceVariant
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,6 @@ Singleton {
|
||||||
property color colorOutlineVariant: useMatugen ? matugenTheme.colorOutlineVariant : defaultTheme.colorOutlineVariant
|
property color colorOutlineVariant: useMatugen ? matugenTheme.colorOutlineVariant : defaultTheme.colorOutlineVariant
|
||||||
property color colorShadow: useMatugen ? matugenTheme.colorShadow : defaultTheme.colorShadow
|
property color colorShadow: useMatugen ? matugenTheme.colorShadow : defaultTheme.colorShadow
|
||||||
|
|
||||||
|
|
||||||
// -----------
|
// -----------
|
||||||
// Check if we should use Matugen theme
|
// Check if we should use Matugen theme
|
||||||
property bool useMatugen: Settings.data.wallpaper.generateTheme && matugenFile.loaded
|
property bool useMatugen: Settings.data.wallpaper.generateTheme && matugenFile.loaded
|
||||||
|
|
@ -91,7 +90,6 @@ Singleton {
|
||||||
property color colorOutlineVariant: "#000000" // A subtler outline color for decorative elements or dividers.
|
property color colorOutlineVariant: "#000000" // A subtler outline color for decorative elements or dividers.
|
||||||
property color colorShadow: "#000000" // The color used for shadows to create elevation.
|
property color colorShadow: "#000000" // The color used for shadows to create elevation.
|
||||||
|
|
||||||
|
|
||||||
// // property color colorBackground: "#191724"
|
// // property color colorBackground: "#191724"
|
||||||
// // property color colorSurface: "#1f1d2e"
|
// // property color colorSurface: "#1f1d2e"
|
||||||
// // property color colorSurfaceVariant: "#26233a"
|
// // property color colorSurfaceVariant: "#26233a"
|
||||||
|
|
|
||||||
|
|
@ -160,6 +160,7 @@ Singleton {
|
||||||
running: false
|
running: false
|
||||||
stdout: StdioCollector {
|
stdout: StdioCollector {
|
||||||
onStreamFinished: {
|
onStreamFinished: {
|
||||||
|
|
||||||
//console.log(this.text)
|
//console.log(this.text)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,8 @@ Rectangle {
|
||||||
font.variableAxes: {
|
font.variableAxes: {
|
||||||
"wght": (Font.Normal + Font.Bold) / 2.0
|
"wght": (Font.Normal + Font.Bold) / 2.0
|
||||||
}
|
}
|
||||||
color: (root.hovering || showFilled) ? Colors.colorOnPrimary : showBorder ? Colors.colorPrimary : Colors.colorOnSurface
|
color: (root.hovering
|
||||||
|
|| showFilled) ? Colors.colorOnPrimary : showBorder ? Colors.colorPrimary : Colors.colorOnSurface
|
||||||
horizontalAlignment: Text.AlignHCenter
|
horizontalAlignment: Text.AlignHCenter
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
opacity: root.enabled ? Style.opacityFull : Style.opacityMedium
|
opacity: root.enabled ? Style.opacityFull : Style.opacityMedium
|
||||||
|
|
|
||||||
|
|
@ -53,8 +53,8 @@ RowLayout {
|
||||||
implicitWidth: (root.baseSize - 5) * scaling
|
implicitWidth: (root.baseSize - 5) * scaling
|
||||||
implicitHeight: (root.baseSize - 5) * scaling
|
implicitHeight: (root.baseSize - 5) * scaling
|
||||||
radius: height * 0.5
|
radius: height * 0.5
|
||||||
color: value ? Colors.colorOnSurface : Colors.colorPrimary //Colors.onBackground : Colors.colorSecondary
|
color: value ? Colors.colorOnSurface : Colors.colorPrimary //Colors.onBackground : Colors.colorSecondary
|
||||||
border.color: value ? Colors.colorSurface: Colors.colorSurface
|
border.color: value ? Colors.colorSurface : Colors.colorSurface
|
||||||
border.width: Math.max(1, Style.borderMedium * scaling)
|
border.width: Math.max(1, Style.borderMedium * scaling)
|
||||||
y: 2 * scaling
|
y: 2 * scaling
|
||||||
x: value ? switcher.width - width - 2 * scaling : 2 * scaling
|
x: value ? switcher.width - width - 2 * scaling : 2 * scaling
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue