mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-08-04 20:48:29 -04:00
frame: consolidate and simplify inset logic
This commit is contained in:
@@ -34,7 +34,7 @@ Scope {
|
||||
}
|
||||
|
||||
function exclusionSizeForEdge(edge) {
|
||||
return root.barEdges.includes(edge) ? SettingsData.frameBarSize : SettingsData.frameThickness;
|
||||
return SettingsData.frameEdgeReservation(root.screen, edge);
|
||||
}
|
||||
|
||||
Loader {
|
||||
|
||||
@@ -262,10 +262,22 @@ PanelWindow {
|
||||
return false;
|
||||
}
|
||||
|
||||
readonly property int cutoutTopInset: win._regionInt(barEdges.includes("top") ? SettingsData.frameBarSize : SettingsData.frameThickness)
|
||||
readonly property int cutoutBottomInset: win._regionInt(barEdges.includes("bottom") ? SettingsData.frameBarSize : SettingsData.frameThickness)
|
||||
readonly property int cutoutLeftInset: win._regionInt(barEdges.includes("left") ? SettingsData.frameBarSize : SettingsData.frameThickness)
|
||||
readonly property int cutoutRightInset: win._regionInt(barEdges.includes("right") ? SettingsData.frameBarSize : SettingsData.frameThickness)
|
||||
readonly property int cutoutTopInset: {
|
||||
SettingsData.barConfigs;
|
||||
return win._regionInt(SettingsData.frameEdgeReservation(win.targetScreen, "top"));
|
||||
}
|
||||
readonly property int cutoutBottomInset: {
|
||||
SettingsData.barConfigs;
|
||||
return win._regionInt(SettingsData.frameEdgeReservation(win.targetScreen, "bottom"));
|
||||
}
|
||||
readonly property int cutoutLeftInset: {
|
||||
SettingsData.barConfigs;
|
||||
return win._regionInt(SettingsData.frameEdgeReservation(win.targetScreen, "left"));
|
||||
}
|
||||
readonly property int cutoutRightInset: {
|
||||
SettingsData.barConfigs;
|
||||
return win._regionInt(SettingsData.frameEdgeReservation(win.targetScreen, "right"));
|
||||
}
|
||||
readonly property int cutoutWidth: Math.max(0, win._windowRegionWidth - win.cutoutLeftInset - win.cutoutRightInset)
|
||||
readonly property int cutoutHeight: Math.max(0, win._windowRegionHeight - win.cutoutTopInset - win.cutoutBottomInset)
|
||||
readonly property int cutoutRadius: {
|
||||
|
||||
Reference in New Issue
Block a user