forked from Shinonome/dots-hyprland
hefty: bar: allow vertical
This commit is contained in:
end-4
@@ -108,7 +108,7 @@ PanelWindow {
|
||||
|
||||
HBar {
|
||||
id: bar
|
||||
load: root.currentPanel === this
|
||||
load: root.currentPanel === this && root.finishedMorphing // the extra condition is to prevent workspace widget from acting up when switching horizontal/vertical... should be fixed later
|
||||
shown: root.finishedMorphing
|
||||
}
|
||||
|
||||
|
||||
@@ -10,8 +10,14 @@ import ".."
|
||||
HAbstractMorphedPanel {
|
||||
id: root
|
||||
|
||||
// Config
|
||||
property bool vertical: Config.options.bar.vertical
|
||||
property bool atBottom: Config.options.bar.bottom
|
||||
property int cornerStyle: Config.options.bar.cornerStyle
|
||||
|
||||
// Own props
|
||||
property int barHeight: Appearance.sizes.baseBarHeight
|
||||
property int barVerticalWidth: Appearance.sizes.baseVerticalBarWidth
|
||||
function getRounding(cornerStyle) {
|
||||
switch(cornerStyle) {
|
||||
case 0: return Appearance.rounding.screenRounding;
|
||||
@@ -39,94 +45,174 @@ HAbstractMorphedPanel {
|
||||
function getHug(cornerStyle) {
|
||||
return cornerStyle === 0;
|
||||
}
|
||||
property int reservedArea: barHeight + getEdgeGap(Config.options.bar.cornerStyle)
|
||||
property int reservedArea: (vertical ? barVerticalWidth : barHeight) + getEdgeGap(cornerStyle)
|
||||
|
||||
// Some info
|
||||
reservedTop: Config.options.bar.bottom ? 0 : reservedArea
|
||||
reservedBottom: Config.options.bar.bottom ? reservedArea : 0
|
||||
reservedTop: (!atBottom && !vertical) ? reservedArea : 0
|
||||
reservedBottom: (atBottom && !vertical) ? reservedArea : 0
|
||||
reservedLeft: (!atBottom && vertical) ? reservedArea : 0
|
||||
reservedRight: (atBottom && vertical) ? reservedArea : 0
|
||||
|
||||
// Background
|
||||
backgroundPolygon: {
|
||||
function getBackgroundPolygon() {
|
||||
print("Generating background polygon for HBar")
|
||||
// It's certainly cleaner to have the below props declared outside, but we do this
|
||||
// to make sure a config change only makes this re-evaluate exactly once
|
||||
const bottom = Config.options.bar.bottom
|
||||
const cornerStyle = Config.options.bar.cornerStyle
|
||||
const rounding = root.getRounding(cornerStyle)
|
||||
const bottom = root.atBottom
|
||||
const vertical = root.vertical
|
||||
const cornerStyle = root.cornerStyle
|
||||
const hug = root.getHug(cornerStyle)
|
||||
const edgeGap = root.getEdgeGap(cornerStyle)
|
||||
const edgeRounding = root.getEdgeRounding(cornerStyle)
|
||||
const hug = root.getHug(cornerStyle)
|
||||
const xLeft = edgeGap
|
||||
const xRight = root.screenWidth - edgeGap
|
||||
const yTop = bottom ? (root.screenHeight - edgeGap - barHeight) : edgeGap
|
||||
const yBottom = bottom ? (root.screenHeight - edgeGap) : (edgeGap + barHeight)
|
||||
const topRounding = bottom ? rounding : edgeRounding
|
||||
const bottomRounding = bottom ? edgeRounding : rounding
|
||||
var topCornerDirection, bottomCornerDirection;
|
||||
if (cornerStyle === 2) { // Rect
|
||||
topCornerDirection = 0;
|
||||
bottomCornerDirection = 0;
|
||||
} else if (cornerStyle === 1) { // Rect
|
||||
topCornerDirection = 1;
|
||||
bottomCornerDirection = -1;
|
||||
const rounding = root.getRounding(cornerStyle)
|
||||
|
||||
const areaHeight = vertical ? root.screenHeight : (root.barHeight + edgeGap * 2)
|
||||
const areaWidth = vertical ? (root.barVerticalWidth + edgeGap * 2) : root.screenWidth
|
||||
const height = vertical ? (root.screenHeight - edgeGap * 2) : root.barHeight
|
||||
const width = vertical ? root.barVerticalWidth : (root.screenWidth - edgeGap * 2)
|
||||
|
||||
const xLeft = (vertical && bottom) ? (root.screenWidth - edgeGap - width) : edgeGap
|
||||
const xRight = (vertical && !bottom) ? (areaWidth - edgeGap) : (root.screenWidth - edgeGap)
|
||||
const yTop = (!vertical && bottom) ? (root.screenHeight - edgeGap - height) : edgeGap
|
||||
const yBottom = (!vertical && !bottom) ? (areaHeight - edgeGap) : (root.screenHeight - edgeGap)
|
||||
|
||||
const topLeftRounding = !bottom ? edgeRounding : rounding
|
||||
const topRightRounding = !(bottom^vertical) ? edgeRounding : rounding
|
||||
const bottomLeftRounding = !!(bottom^vertical) ? edgeRounding : rounding
|
||||
const bottomRightRounding = bottom ? edgeRounding : rounding
|
||||
|
||||
var topCornerYDirection = 0, bottomCornerYDirection = 0, leftCornerXDirection = 0, rightCornerXDirection = 0;
|
||||
if (vertical) {
|
||||
topCornerYDirection = 1;
|
||||
bottomCornerYDirection = -1;
|
||||
} else if (cornerStyle === 2) { // Rect
|
||||
topCornerYDirection = 0;
|
||||
bottomCornerYDirection = 0;
|
||||
} else if (cornerStyle === 1) { // Rounded
|
||||
topCornerYDirection = 1;
|
||||
bottomCornerYDirection = -1;
|
||||
} else { // Hug
|
||||
topCornerDirection = bottom ? -1 : 1;
|
||||
bottomCornerDirection = bottom ? -1 : 1;
|
||||
topCornerYDirection = bottom ? -1 : 1;
|
||||
bottomCornerYDirection = bottom ? -1 : 1;
|
||||
}
|
||||
|
||||
const points = [
|
||||
if (!vertical) {
|
||||
leftCornerXDirection = 1;
|
||||
rightCornerXDirection = -1
|
||||
} else if (cornerStyle === 2) { // Rect
|
||||
leftCornerXDirection = 0;
|
||||
rightCornerXDirection = 0;
|
||||
} else if (cornerStyle === 1) { // Rounded
|
||||
leftCornerXDirection = 1;
|
||||
rightCornerXDirection = -1;
|
||||
} else { // Hug
|
||||
leftCornerXDirection = bottom ? -1 : 1;
|
||||
rightCornerXDirection = bottom ? -1 : 1;
|
||||
}
|
||||
var points = [
|
||||
// bottom-middle
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(root.screenWidth * 1/2, yBottom), new CornerRounding.CornerRounding(0)),
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(root.screenWidth * 0.1, yBottom), new CornerRounding.CornerRounding(0)),
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xLeft + width * 1/2, yBottom), new CornerRounding.CornerRounding(0)),
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xLeft + width * 0.1, yBottom), new CornerRounding.CornerRounding(0)),
|
||||
|
||||
// bottom-left /||
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xLeft + rounding, yBottom), new CornerRounding.CornerRounding(0)),
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xLeft, yBottom), new CornerRounding.CornerRounding(bottomRounding)),
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xLeft, yBottom + rounding * bottomCornerDirection), new CornerRounding.CornerRounding(edgeRounding)),
|
||||
// top-left |/-
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xLeft, yTop + rounding * topCornerDirection), new CornerRounding.CornerRounding(0)),
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xLeft, yTop), new CornerRounding.CornerRounding(topRounding)),
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xLeft + rounding, yTop), new CornerRounding.CornerRounding(0)),
|
||||
// bottom-left
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xLeft + rounding * leftCornerXDirection, yBottom), new CornerRounding.CornerRounding(0)),
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xLeft, yBottom), new CornerRounding.CornerRounding(bottomLeftRounding)),
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xLeft, yBottom + rounding * bottomCornerYDirection), new CornerRounding.CornerRounding(edgeRounding)),
|
||||
|
||||
// middle-left
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xLeft, yTop + height * 0.9), new CornerRounding.CornerRounding(0)),
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xLeft, yTop + height * 1/2), new CornerRounding.CornerRounding(0)),
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xLeft, yTop + height * 0.1), new CornerRounding.CornerRounding(0)),
|
||||
|
||||
// top-left
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xLeft, yTop + rounding * topCornerYDirection), new CornerRounding.CornerRounding(0)),
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xLeft, yTop), new CornerRounding.CornerRounding(topLeftRounding)),
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xLeft + rounding * leftCornerXDirection, yTop), new CornerRounding.CornerRounding(0)),
|
||||
|
||||
// top-middle
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(root.screenWidth * 0.1, yTop), new CornerRounding.CornerRounding(0)),
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(root.screenWidth * 1/2, yTop), new CornerRounding.CornerRounding(0)),
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(root.screenWidth * 0.9, yTop), new CornerRounding.CornerRounding(0)),
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xLeft + width * 0.1, yTop), new CornerRounding.CornerRounding(0)),
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xLeft + width * 1/2, yTop), new CornerRounding.CornerRounding(0)),
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xLeft + width * 0.9, yTop), new CornerRounding.CornerRounding(0)),
|
||||
|
||||
// top-right -\|
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xRight - rounding, yTop), new CornerRounding.CornerRounding(0)),
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xRight, yTop), new CornerRounding.CornerRounding(topRounding)),
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xRight, yTop + rounding * topCornerDirection), new CornerRounding.CornerRounding(0)),
|
||||
// top-right
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xRight + rounding * rightCornerXDirection, yTop), new CornerRounding.CornerRounding(0)),
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xRight, yTop), new CornerRounding.CornerRounding(topRightRounding)),
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xRight, yTop + rounding * topCornerYDirection), new CornerRounding.CornerRounding(0)),
|
||||
|
||||
// bottom-right ||\
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xRight, yBottom + rounding * bottomCornerDirection), new CornerRounding.CornerRounding(edgeRounding)),
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xRight, yBottom), new CornerRounding.CornerRounding(bottomRounding)),
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xRight - rounding, yBottom), new CornerRounding.CornerRounding(0)),
|
||||
// middle-right
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xRight, yTop + height * 0.1), new CornerRounding.CornerRounding(0)),
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xRight, yTop + height * 1/2), new CornerRounding.CornerRounding(0)),
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xRight, yTop + height * 0.9), new CornerRounding.CornerRounding(0)),
|
||||
|
||||
// bottom-right
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xRight, yBottom + rounding * bottomCornerYDirection), new CornerRounding.CornerRounding(edgeRounding)),
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xRight, yBottom), new CornerRounding.CornerRounding(bottomRightRounding)),
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xRight + rounding * rightCornerXDirection, yBottom), new CornerRounding.CornerRounding(0)),
|
||||
|
||||
// bottom-middle
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(root.screenWidth * 0.9, yBottom), new CornerRounding.CornerRounding(0)),
|
||||
new MaterialShapes.PointNRound(new Offset.Offset(xLeft + width * 0.9, yBottom), new CornerRounding.CornerRounding(0)),
|
||||
]
|
||||
return MaterialShapes.customPolygon(points, 1, new Offset.Offset(root.screenWidth / 2, edgeGap + barHeight / 2))
|
||||
}
|
||||
backgroundPolygon: getBackgroundPolygon()
|
||||
Connections {
|
||||
target: Config
|
||||
function onReadyChanged() {
|
||||
if (Config.ready)
|
||||
root.backgroundPolygon = root.getBackgroundPolygon()
|
||||
}
|
||||
function onReloaded() {
|
||||
root.extraLoadCondition = false
|
||||
root.backgroundPolygon = root.getBackgroundPolygon()
|
||||
root.extraLoadCondition = true
|
||||
}
|
||||
}
|
||||
|
||||
// Content
|
||||
implicitHeight: barHeight + getEdgeGap(Config.options.bar.cornerStyle) * 2
|
||||
implicitHeight: vertical ? screenHeight : (barHeight + getEdgeGap(cornerStyle) * 2)
|
||||
implicitWidth: vertical ? (barVerticalWidth + getEdgeGap(cornerStyle) * 2) : screenWidth
|
||||
width: implicitWidth
|
||||
height: implicitHeight
|
||||
anchors {
|
||||
top: parent.top
|
||||
bottom: undefined
|
||||
left: parent.left
|
||||
right: parent.right
|
||||
left: undefined
|
||||
right: undefined
|
||||
}
|
||||
states: State {
|
||||
name: "bottom"
|
||||
when: Config.options.bar.bottom
|
||||
AnchorChanges {
|
||||
target: root
|
||||
anchors.top: undefined
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
states: [
|
||||
State {
|
||||
name: "bottom"
|
||||
when: root.atBottom && !root.vertical
|
||||
AnchorChanges {
|
||||
target: root
|
||||
anchors.top: undefined
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.left: undefined
|
||||
anchors.right: undefined
|
||||
}
|
||||
},
|
||||
State {
|
||||
name: "left"
|
||||
when: !root.atBottom && root.vertical
|
||||
AnchorChanges {
|
||||
target: root
|
||||
anchors.top: undefined
|
||||
anchors.bottom: undefined
|
||||
anchors.left: parent.left
|
||||
anchors.right: undefined
|
||||
}
|
||||
},
|
||||
State {
|
||||
name: "right"
|
||||
when: root.atBottom && root.vertical
|
||||
AnchorChanges {
|
||||
target: root
|
||||
anchors.top: undefined
|
||||
anchors.bottom: undefined
|
||||
anchors.left: undefined
|
||||
anchors.right: parent.right
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
transitions: Transition {
|
||||
AnchorAnimation {
|
||||
duration: 500
|
||||
@@ -135,10 +221,11 @@ HAbstractMorphedPanel {
|
||||
}
|
||||
}
|
||||
|
||||
property bool extraLoadCondition: true
|
||||
FadeLazyLoader {
|
||||
id: contentLoader
|
||||
load: root.load
|
||||
shown: root.shown
|
||||
load: root.load && root.extraLoadCondition
|
||||
shown: root.shown && root.extraLoadCondition
|
||||
anchors.fill: parent
|
||||
component: HBarContent {
|
||||
parent: contentLoader
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
import QtQuick
|
||||
import QtQuick.Layouts
|
||||
import Quickshell
|
||||
import qs.services
|
||||
import qs.modules.common.widgets
|
||||
import qs.modules.common as C
|
||||
|
||||
Item {
|
||||
id: root
|
||||
@@ -11,13 +9,16 @@ Item {
|
||||
id: leftSide
|
||||
anchors.left: parent.left
|
||||
width: (parent.width - centerSide.width) / 2
|
||||
HBarUserFallbackComponentRepeater {
|
||||
componentNames: C.Config.options.hefty.bar.leftWidgets
|
||||
}
|
||||
}
|
||||
|
||||
Side {
|
||||
id: centerSide
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
HBarUserFallbackComponentRepeater {
|
||||
componentNames: [["Workspaces"]]
|
||||
componentNames: C.Config.options.hefty.bar.centerWidgets
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,6 +26,9 @@ Item {
|
||||
id: rightSide
|
||||
anchors.right: parent.right
|
||||
width: (parent.width - centerSide.width) / 2
|
||||
HBarUserFallbackComponentRepeater {
|
||||
componentNames: C.Config.options.hefty.bar.rightWidgets
|
||||
}
|
||||
}
|
||||
|
||||
component Side: RowLayout {
|
||||
|
||||
@@ -5,7 +5,8 @@ import qs.modules.common as C
|
||||
|
||||
IIBar.Workspaces {
|
||||
id: root
|
||||
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
|
||||
implicitWidth: root.vertical ? C.Appearance.sizes.verticalBarWidth : (root.workspaceButtonWidth * root.workspacesShown - 2)
|
||||
implicitHeight: root.vertical ? (root.workspaceButtonWidth * root.workspacesShown - 2) : C.Appearance.sizes.barHeight
|
||||
vertical: C.Config.options.bar.vertical
|
||||
Layout.alignment: vertical ? Qt.AlignHCenter : Qt.AlignVCenter
|
||||
Layout.fillWidth: vertical
|
||||
Layout.fillHeight: !vertical
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user