fix some backgrounds, now attaching to wrappers rather than panel itself most of the time
This commit is contained in:
@@ -58,6 +58,7 @@ JsonObject {
|
|||||||
property Popouts popouts: Popouts {
|
property Popouts popouts: Popouts {
|
||||||
}
|
}
|
||||||
property int rounding: 8
|
property int rounding: 8
|
||||||
|
property int smoothing: 32
|
||||||
|
|
||||||
component Popouts: JsonObject {
|
component Popouts: JsonObject {
|
||||||
property bool activeWindow: true
|
property bool activeWindow: true
|
||||||
|
|||||||
@@ -94,6 +94,7 @@ Singleton {
|
|||||||
hideWhenNotif: barConfig.hideWhenNotif,
|
hideWhenNotif: barConfig.hideWhenNotif,
|
||||||
rounding: barConfig.rounding,
|
rounding: barConfig.rounding,
|
||||||
border: barConfig.border,
|
border: barConfig.border,
|
||||||
|
smoothing: barConfig.smoothing,
|
||||||
height: barConfig.height,
|
height: barConfig.height,
|
||||||
popouts: {
|
popouts: {
|
||||||
tray: barConfig.popouts.tray,
|
tray: barConfig.popouts.tray,
|
||||||
|
|||||||
+29
-18
@@ -158,6 +158,7 @@ Variants {
|
|||||||
id: blobGroup
|
id: blobGroup
|
||||||
|
|
||||||
color: DynamicColors.palette.m3surface
|
color: DynamicColors.palette.m3surface
|
||||||
|
smoothing: Config.barConfig.smoothing
|
||||||
|
|
||||||
Behavior on color {
|
Behavior on color {
|
||||||
CAnim {
|
CAnim {
|
||||||
@@ -179,28 +180,34 @@ Variants {
|
|||||||
PanelBg {
|
PanelBg {
|
||||||
id: dashBg
|
id: dashBg
|
||||||
|
|
||||||
deformAmount: 0.08 * Config.appearance.deform.scale
|
property real extraHeight: 0.2
|
||||||
implicitHeight: panels.dashboard.height
|
|
||||||
|
deformAmount: 0.08
|
||||||
|
implicitHeight: panels.dashboard.height * (1 + extraHeight)
|
||||||
implicitWidth: panels.dashboard.width
|
implicitWidth: panels.dashboard.width
|
||||||
panel: panels.dashboard
|
panel: panels.dashboardWrapper
|
||||||
radius: Appearance.rounding.normal
|
radius: Appearance.rounding.normal
|
||||||
x: panels.dashboardWrapper.x + panels.dashboard.x + Config.barConfig.border
|
x: panels.dashboardWrapper.x + panels.dashboard.x + Config.barConfig.border
|
||||||
y: panels.dashboardWrapper.y + panels.dashboard.y + bar.implicitHeight
|
y: panels.dashboardWrapper.y + panels.dashboard.y + bar.implicitHeight - panels.dashboard.height * extraHeight
|
||||||
}
|
}
|
||||||
|
|
||||||
PanelBg {
|
PanelBg {
|
||||||
id: launcherBg
|
id: launcherBg
|
||||||
|
|
||||||
deformAmount: 0.08 * Config.appearance.deform.scale
|
property real extraHeight: 0.2
|
||||||
|
|
||||||
|
deformAmount: 0.08
|
||||||
|
implicitHeight: panels.launcher.height * (1 + extraHeight)
|
||||||
panel: panels.launcher
|
panel: panels.launcher
|
||||||
radius: Appearance.rounding.smallest + 5
|
radius: Appearance.rounding.smallest + 5
|
||||||
|
y: panels.launcher.y + bar.implicitHeight
|
||||||
}
|
}
|
||||||
|
|
||||||
PanelBg {
|
PanelBg {
|
||||||
id: sidebarBg
|
id: sidebarBg
|
||||||
|
|
||||||
bottomLeftRadius: 0
|
bottomLeftRadius: 0
|
||||||
deformAmount: 0.08 * Config.appearance.deform.scale
|
deformAmount: 0.08
|
||||||
exclude: panels.sidebar.offsetScale > 0.08 ? [] : [utilsBg]
|
exclude: panels.sidebar.offsetScale > 0.08 ? [] : [utilsBg]
|
||||||
implicitHeight: panel.height * (1 / rawDeformMatrix.m22) + 2
|
implicitHeight: panel.height * (1 / rawDeformMatrix.m22) + 2
|
||||||
panel: panels.sidebar
|
panel: panels.sidebar
|
||||||
@@ -209,10 +216,10 @@ Variants {
|
|||||||
PanelBg {
|
PanelBg {
|
||||||
id: osdBg
|
id: osdBg
|
||||||
|
|
||||||
deformAmount: 0.1 * Config.appearance.deform.scale
|
deformAmount: 0.1
|
||||||
implicitHeight: panels.osd.height
|
implicitHeight: panels.osd.height
|
||||||
implicitWidth: panels.osd.width
|
implicitWidth: panels.osd.width
|
||||||
panel: panels.osd
|
panel: panels.osdWrapper
|
||||||
radius: 20
|
radius: 20
|
||||||
x: panels.osdWrapper.x + panels.osd.x + Config.barConfig.border
|
x: panels.osdWrapper.x + panels.osd.x + Config.barConfig.border
|
||||||
y: panels.osdWrapper.y + panels.osd.y + bar.implicitHeight
|
y: panels.osdWrapper.y + panels.osd.y + bar.implicitHeight
|
||||||
@@ -227,7 +234,7 @@ Variants {
|
|||||||
PanelBg {
|
PanelBg {
|
||||||
id: utilsBg
|
id: utilsBg
|
||||||
|
|
||||||
deformAmount: panels.sidebar.visible ? (0.1 * Config.appearance.deform.scale) : (0.1 * Config.appearance.deform.scale)
|
deformAmount: panels.sidebar.visible ? (0.1) : (0.1)
|
||||||
exclude: panels.sidebar.offsetScale > 0.08 ? [] : [sidebarBg]
|
exclude: panels.sidebar.offsetScale > 0.08 ? [] : [sidebarBg]
|
||||||
panel: panels.utilities
|
panel: panels.utilities
|
||||||
topLeftRadius: 0
|
topLeftRadius: 0
|
||||||
@@ -238,10 +245,10 @@ Variants {
|
|||||||
|
|
||||||
property real extraHeight: panels.popouts.isDetached ? 0 : 0.2
|
property real extraHeight: panels.popouts.isDetached ? 0 : 0.2
|
||||||
|
|
||||||
deformAmount: panels.popouts.isDetached ? 0.05 * Config.appearance.deform.scale : panels.popouts.hasCurrent ? 0.15 * Config.appearance.deform.scale : 0.1 * Config.appearance.deform.scale
|
deformAmount: panels.popouts.isDetached ? 0.05 : panels.popouts.hasCurrent ? 0.15 : 0.1
|
||||||
implicitHeight: panels.popouts.height * (1 + extraHeight)
|
implicitHeight: panels.popouts.height * (1 + extraHeight)
|
||||||
implicitWidth: panels.popouts.width
|
implicitWidth: panels.popouts.width
|
||||||
panel: panels.popouts
|
panel: panels.popoutsWrapper
|
||||||
radius: (panels.popouts.currentName.startsWith("audio") || panels.popouts.currentName.startsWith("updates")) ? Appearance.rounding.normal : 20 * Appearance.rounding.scale
|
radius: (panels.popouts.currentName.startsWith("audio") || panels.popouts.currentName.startsWith("updates")) ? Appearance.rounding.normal : 20 * Appearance.rounding.scale
|
||||||
x: panels.popoutsWrapper.x + panels.popouts.x + Config.barConfig.border
|
x: panels.popoutsWrapper.x + panels.popouts.x + Config.barConfig.border
|
||||||
y: panels.popoutsWrapper.y + panels.popouts.y + bar.implicitHeight - panels.popouts.height * extraHeight
|
y: panels.popoutsWrapper.y + panels.popouts.y + bar.implicitHeight - panels.popouts.height * extraHeight
|
||||||
@@ -255,10 +262,10 @@ Variants {
|
|||||||
PanelBg {
|
PanelBg {
|
||||||
id: resourcesBg
|
id: resourcesBg
|
||||||
|
|
||||||
deformAmount: 0.08 * Config.appearance.deform.scale
|
deformAmount: 0.08
|
||||||
implicitHeight: panels.resources.height
|
implicitHeight: panels.resources.height
|
||||||
implicitWidth: panels.resources.width
|
implicitWidth: panels.resources.width
|
||||||
panel: panels.resources
|
panel: panels.resourcesWrapper
|
||||||
radius: Appearance.rounding.normal
|
radius: Appearance.rounding.normal
|
||||||
x: panels.resourcesWrapper.x + panels.resources.x + Config.barConfig.border
|
x: panels.resourcesWrapper.x + panels.resources.x + Config.barConfig.border
|
||||||
y: panels.resourcesWrapper.y + panels.resources.y + bar.implicitHeight
|
y: panels.resourcesWrapper.y + panels.resources.y + bar.implicitHeight
|
||||||
@@ -267,19 +274,23 @@ Variants {
|
|||||||
PanelBg {
|
PanelBg {
|
||||||
id: settingsBg
|
id: settingsBg
|
||||||
|
|
||||||
deformAmount: 0.08 * Config.appearance.deform.scale
|
property real extraHeight: 0.2
|
||||||
|
|
||||||
|
deformAmount: 0.08
|
||||||
|
implicitHeight: panels.settings.height * (1 + extraHeight)
|
||||||
|
implicitWidth: panels.settings.width
|
||||||
panel: panels.settings
|
panel: panels.settings
|
||||||
radius: Appearance.rounding.large
|
radius: Appearance.rounding.large
|
||||||
topLeftRadius: Appearance.rounding.large + Appearance.padding.smaller
|
topLeftRadius: Appearance.rounding.large + Appearance.padding.smaller
|
||||||
topRightRadius: Appearance.rounding.large + Appearance.padding.smaller
|
topRightRadius: Appearance.rounding.large + Appearance.padding.smaller
|
||||||
x: panels.settingsWrapper.x + panels.settings.x + Config.barConfig.border
|
x: panels.settingsWrapper.x + panels.settings.x + Config.barConfig.border
|
||||||
y: panels.settingsWrapper.y + panels.settings.y + bar.implicitHeight
|
y: panels.settingsWrapper.y + panels.settings.y + bar.implicitHeight - panels.settings.height * extraHeight
|
||||||
}
|
}
|
||||||
|
|
||||||
PanelBg {
|
PanelBg {
|
||||||
id: dockBg
|
id: dockBg
|
||||||
|
|
||||||
deformAmount: 0.08 * Config.appearance.deform.scale
|
deformAmount: 0.08
|
||||||
panel: panels.dock
|
panel: panels.dock
|
||||||
radius: Appearance.rounding.normal
|
radius: Appearance.rounding.normal
|
||||||
}
|
}
|
||||||
@@ -287,7 +298,7 @@ Variants {
|
|||||||
PanelBg {
|
PanelBg {
|
||||||
id: drawingBg
|
id: drawingBg
|
||||||
|
|
||||||
deformAmount: 0.08 * Config.appearance.deform.scale
|
deformAmount: 0.08
|
||||||
panel: panels.drawing
|
panel: panels.drawing
|
||||||
radius: Appearance.rounding.normal
|
radius: Appearance.rounding.normal
|
||||||
}
|
}
|
||||||
@@ -382,7 +393,7 @@ Variants {
|
|||||||
property real deformAmount: 0.15
|
property real deformAmount: 0.15
|
||||||
required property Item panel
|
required property Item panel
|
||||||
|
|
||||||
deformScale: deformAmount / 10000
|
deformScale: (deformAmount * Config.appearance.deform.scale) / 10000
|
||||||
group: blobGroup
|
group: blobGroup
|
||||||
implicitHeight: panel.height
|
implicitHeight: panel.height
|
||||||
implicitWidth: panel.width
|
implicitWidth: panel.width
|
||||||
|
|||||||
@@ -19,8 +19,8 @@ SettingsPage {
|
|||||||
}
|
}
|
||||||
|
|
||||||
SettingSpinBox {
|
SettingSpinBox {
|
||||||
name: "Height"
|
|
||||||
min: 1
|
min: 1
|
||||||
|
name: "Height"
|
||||||
object: Config.barConfig
|
object: Config.barConfig
|
||||||
setting: "height"
|
setting: "height"
|
||||||
}
|
}
|
||||||
@@ -29,8 +29,8 @@ SettingsPage {
|
|||||||
}
|
}
|
||||||
|
|
||||||
SettingSpinBox {
|
SettingSpinBox {
|
||||||
name: "Rounding"
|
|
||||||
min: 0
|
min: 0
|
||||||
|
name: "Rounding"
|
||||||
object: Config.barConfig
|
object: Config.barConfig
|
||||||
setting: "rounding"
|
setting: "rounding"
|
||||||
}
|
}
|
||||||
@@ -39,11 +39,21 @@ SettingsPage {
|
|||||||
}
|
}
|
||||||
|
|
||||||
SettingSpinBox {
|
SettingSpinBox {
|
||||||
name: "Border"
|
|
||||||
min: 0
|
min: 0
|
||||||
|
name: "Border"
|
||||||
object: Config.barConfig
|
object: Config.barConfig
|
||||||
setting: "border"
|
setting: "border"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Separator {
|
||||||
|
}
|
||||||
|
|
||||||
|
SettingSpinBox {
|
||||||
|
min: 0
|
||||||
|
name: "Smoothing"
|
||||||
|
object: Config.barConfig
|
||||||
|
setting: "smoothing"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SettingsSection {
|
SettingsSection {
|
||||||
@@ -145,8 +155,8 @@ SettingsPage {
|
|||||||
}
|
}
|
||||||
|
|
||||||
SettingSpinBox {
|
SettingSpinBox {
|
||||||
name: "Dock height"
|
|
||||||
min: 1
|
min: 1
|
||||||
|
name: "Dock height"
|
||||||
object: Config.dock
|
object: Config.dock
|
||||||
setting: "height"
|
setting: "height"
|
||||||
}
|
}
|
||||||
@@ -173,8 +183,8 @@ SettingsPage {
|
|||||||
}
|
}
|
||||||
|
|
||||||
SettingStringList {
|
SettingStringList {
|
||||||
name: "Pinned apps"
|
|
||||||
addLabel: qsTr("Add pinned app")
|
addLabel: qsTr("Add pinned app")
|
||||||
|
name: "Pinned apps"
|
||||||
object: Config.dock
|
object: Config.dock
|
||||||
setting: "pinnedApps"
|
setting: "pinnedApps"
|
||||||
}
|
}
|
||||||
@@ -183,8 +193,8 @@ SettingsPage {
|
|||||||
}
|
}
|
||||||
|
|
||||||
SettingStringList {
|
SettingStringList {
|
||||||
name: "Ignored app regexes"
|
|
||||||
addLabel: qsTr("Add ignored regex")
|
addLabel: qsTr("Add ignored regex")
|
||||||
|
name: "Ignored app regexes"
|
||||||
object: Config.dock
|
object: Config.dock
|
||||||
setting: "ignoredAppRegexes"
|
setting: "ignoredAppRegexes"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -88,7 +88,13 @@ export const settingsIndex = [
|
|||||||
category: "general",
|
category: "general",
|
||||||
categoryName: "General",
|
categoryName: "General",
|
||||||
section: "Color",
|
section: "Color",
|
||||||
keywords: ["night light", "blue light", "temperature", "warm", "schedule"],
|
keywords: [
|
||||||
|
"night light",
|
||||||
|
"blue light",
|
||||||
|
"temperature",
|
||||||
|
"warm",
|
||||||
|
"schedule",
|
||||||
|
],
|
||||||
},
|
},
|
||||||
// Default Apps section
|
// Default Apps section
|
||||||
{
|
{
|
||||||
@@ -166,6 +172,14 @@ export const settingsIndex = [
|
|||||||
section: "Bar",
|
section: "Bar",
|
||||||
keywords: ["outline", "stroke", "edge"],
|
keywords: ["outline", "stroke", "edge"],
|
||||||
},
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
name: "Smoothing",
|
||||||
|
category: "bar",
|
||||||
|
categoryName: "Bar",
|
||||||
|
section: "Bar",
|
||||||
|
keywords: ["smoothing", "rounding"],
|
||||||
|
},
|
||||||
// Popouts section
|
// Popouts section
|
||||||
{
|
{
|
||||||
name: "Tray",
|
name: "Tray",
|
||||||
@@ -1150,7 +1164,7 @@ export function searchSettings(query, fuzzyModule) {
|
|||||||
Object.assign({}, setting, {
|
Object.assign({}, setting, {
|
||||||
matchType: "exact-keyword",
|
matchType: "exact-keyword",
|
||||||
score: 1.0,
|
score: 1.0,
|
||||||
}),
|
})
|
||||||
);
|
);
|
||||||
seen.add(key);
|
seen.add(key);
|
||||||
break;
|
break;
|
||||||
@@ -1169,7 +1183,7 @@ export function searchSettings(query, fuzzyModule) {
|
|||||||
Object.assign({}, setting, {
|
Object.assign({}, setting, {
|
||||||
matchType: "partial-keyword",
|
matchType: "partial-keyword",
|
||||||
score: 0.8,
|
score: 0.8,
|
||||||
}),
|
})
|
||||||
);
|
);
|
||||||
seen.add(key);
|
seen.add(key);
|
||||||
break;
|
break;
|
||||||
@@ -1184,7 +1198,10 @@ export function searchSettings(query, fuzzyModule) {
|
|||||||
|
|
||||||
if (setting.name.toLowerCase().includes(q)) {
|
if (setting.name.toLowerCase().includes(q)) {
|
||||||
results.push(
|
results.push(
|
||||||
Object.assign({}, setting, { matchType: "name-contains", score: 0.7 }),
|
Object.assign({}, setting, {
|
||||||
|
matchType: "name-contains",
|
||||||
|
score: 0.7,
|
||||||
|
})
|
||||||
);
|
);
|
||||||
seen.add(key);
|
seen.add(key);
|
||||||
}
|
}
|
||||||
@@ -1210,7 +1227,7 @@ export function searchSettings(query, fuzzyModule) {
|
|||||||
matchType: "fuzzy",
|
matchType: "fuzzy",
|
||||||
score: r.score * 0.6,
|
score: r.score * 0.6,
|
||||||
_searchTarget: undefined,
|
_searchTarget: undefined,
|
||||||
}),
|
})
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,38 +26,6 @@ Item {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// states: State {
|
|
||||||
// name: "visible"
|
|
||||||
// when: root.visibilities.settings
|
|
||||||
//
|
|
||||||
// PropertyChanges {
|
|
||||||
// root.implicitHeight: content.implicitHeight
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// transitions: [
|
|
||||||
// Transition {
|
|
||||||
// from: ""
|
|
||||||
// to: "visible"
|
|
||||||
//
|
|
||||||
// Anim {
|
|
||||||
// duration: MaterialEasing.expressiveEffectsTime
|
|
||||||
// easing.bezierCurve: MaterialEasing.expressiveEffects
|
|
||||||
// property: "implicitHeight"
|
|
||||||
// target: root
|
|
||||||
// }
|
|
||||||
// },
|
|
||||||
// Transition {
|
|
||||||
// from: "visible"
|
|
||||||
// to: ""
|
|
||||||
//
|
|
||||||
// Anim {
|
|
||||||
// easing.bezierCurve: MaterialEasing.expressiveEffects
|
|
||||||
// property: "implicitHeight"
|
|
||||||
// target: root
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// ]
|
|
||||||
|
|
||||||
CustomClippingRect {
|
CustomClippingRect {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user