Removed borders as they are hard to manage + scaling issues
This commit is contained in:
parent
19e1f8053e
commit
eda65a9948
3 changed files with 40 additions and 86 deletions
11
Bar/Bar.qml
11
Bar/Bar.qml
|
|
@ -51,18 +51,7 @@ Scope {
|
||||||
color: Theme.backgroundPrimary
|
color: Theme.backgroundPrimary
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
anchors.bottom: parent.bottom
|
|
||||||
width: parent.width
|
|
||||||
height: 1
|
|
||||||
color: "transparent"
|
|
||||||
border.color: Theme.outline || "#444"
|
|
||||||
border.width: 1
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Row {
|
Row {
|
||||||
id: leftWidgetsRow
|
id: leftWidgetsRow
|
||||||
|
|
|
||||||
|
|
@ -104,32 +104,13 @@ PanelWindow {
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
id: activeWindowTitleContainer
|
id: activeWindowTitleContainer
|
||||||
color: "transparent"
|
color: Theme.backgroundPrimary
|
||||||
|
|
||||||
|
|
||||||
width: Math.min(barBackground.width - 200, activeWindowTitle.implicitWidth + (Settings.settings.showActiveWindowIcon ? 28 : 22)) + 16
|
width: Math.min(barBackground.width - 200, activeWindowTitle.implicitWidth + (Settings.settings.showActiveWindowIcon ? 28 : 22)) + 16
|
||||||
height: activeWindowTitle.implicitHeight + 12
|
height: activeWindowTitle.implicitHeight + 12
|
||||||
|
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
id: innerRect
|
|
||||||
|
|
||||||
bottomLeftRadius: Math.max(0, width / 2)
|
bottomLeftRadius: Math.max(0, width / 2)
|
||||||
bottomRightRadius: Math.max(0, width / 2)
|
bottomRightRadius: Math.max(0, width / 2)
|
||||||
color: Theme.backgroundPrimary
|
|
||||||
anchors {
|
|
||||||
fill: parent
|
|
||||||
leftMargin: 0
|
|
||||||
rightMargin: 0
|
|
||||||
topMargin: -1
|
|
||||||
bottomMargin: 0
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
border.color: Theme.outline || "#444";
|
|
||||||
border.width: 1;
|
|
||||||
|
|
||||||
IconImage {
|
IconImage {
|
||||||
id: icon
|
id: icon
|
||||||
|
|
@ -159,7 +140,7 @@ PanelWindow {
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
maximumLineCount: 1
|
maximumLineCount: 1
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -42,9 +42,6 @@ PanelWithOverlay {
|
||||||
// Access the shell's SettingsWindow instead of creating a new one
|
// Access the shell's SettingsWindow instead of creating a new one
|
||||||
id: sidebarPopupRect
|
id: sidebarPopupRect
|
||||||
|
|
||||||
// Necessary for the scaling to work on smaller screens
|
|
||||||
width: 530
|
|
||||||
|
|
||||||
property real slideOffset: width
|
property real slideOffset: width
|
||||||
property bool isAnimating: false
|
property bool isAnimating: false
|
||||||
property int leftPadding: 20 * Theme.scale(Screen)
|
property int leftPadding: 20 * Theme.scale(Screen)
|
||||||
|
|
@ -116,6 +113,8 @@ PanelWithOverlay {
|
||||||
isRecording = false;
|
isRecording = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Necessary for the scaling to work on smaller screens
|
||||||
|
width: 526
|
||||||
implicitWidth: 500 * Theme.scale(Screen)
|
implicitWidth: 500 * Theme.scale(Screen)
|
||||||
implicitHeight: 700 * Theme.scale(Screen)
|
implicitHeight: 700 * Theme.scale(Screen)
|
||||||
visible: parent.visible
|
visible: parent.visible
|
||||||
|
|
@ -173,28 +172,15 @@ PanelWithOverlay {
|
||||||
Rectangle {
|
Rectangle {
|
||||||
id: mainRectangle
|
id: mainRectangle
|
||||||
|
|
||||||
color: "transparent"
|
|
||||||
anchors.top: sidebarPopupRect.top
|
anchors.top: sidebarPopupRect.top
|
||||||
width: sidebarPopupRect.width - sidebarPopupRect.leftPadding
|
width: sidebarPopupRect.width - sidebarPopupRect.leftPadding
|
||||||
height: sidebarPopupRect.height - sidebarPopupRect.bottomPadding
|
height: sidebarPopupRect.height - sidebarPopupRect.bottomPadding
|
||||||
x: sidebarPopupRect.leftPadding + sidebarPopupRect.slideOffset
|
x: sidebarPopupRect.leftPadding + sidebarPopupRect.slideOffset
|
||||||
y: 0
|
y: 0
|
||||||
z: 0
|
z: 0
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
color: Theme.backgroundPrimary
|
color: Theme.backgroundPrimary
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
bottomLeftRadius: 20 * Theme.scale(Screen)
|
bottomLeftRadius: 20 * Theme.scale(Screen)
|
||||||
border.color: Theme.outline || "#444"
|
|
||||||
border.width: 1
|
|
||||||
|
|
||||||
anchors {
|
|
||||||
fill: parent
|
|
||||||
leftMargin: 0
|
|
||||||
rightMargin: -1
|
|
||||||
topMargin: -1
|
|
||||||
bottomMargin: 0
|
|
||||||
}
|
|
||||||
|
|
||||||
Behavior on x {
|
Behavior on x {
|
||||||
enabled: !sidebarPopupRect.isAnimating
|
enabled: !sidebarPopupRect.isAnimating
|
||||||
|
|
@ -208,8 +194,6 @@ PanelWithOverlay {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
// SettingsIcon component
|
// SettingsIcon component
|
||||||
SettingsIcon {
|
SettingsIcon {
|
||||||
id: settingsModal
|
id: settingsModal
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue