diff --git a/Bar/Bar.qml b/Bar/Bar.qml index 48c18cb..653f6e9 100644 --- a/Bar/Bar.qml +++ b/Bar/Bar.qml @@ -182,7 +182,7 @@ Scope { aboveWindows: false implicitHeight: 24 - Corners { + Corner { id: topLeftCorner position: "bottomleft" @@ -209,7 +209,7 @@ Scope { aboveWindows: false implicitHeight: 24 - Corners { + Corner { id: topRightCorner position: "bottomright" @@ -235,7 +235,7 @@ Scope { aboveWindows: false implicitHeight: 24 - Corners { + Corner { id: bottomLeftCorner position: "topleft" @@ -261,7 +261,7 @@ Scope { aboveWindows: false implicitHeight: 24 - Corners { + Corner{ id: bottomRightCorner position: "topright" diff --git a/Bar/Modules/ActiveWindow.qml b/Bar/Modules/ActiveWindow.qml index fca39d5..d13bca7 100644 --- a/Bar/Modules/ActiveWindow.qml +++ b/Bar/Modules/ActiveWindow.qml @@ -140,31 +140,6 @@ PanelWindow { maximumLineCount: 1 } - Loader { - active: Settings.settings.showCorners - anchors.top: parent.top - sourceComponent: Item { - Corners { - id: activeCornerRight - position: "bottomleft" - size: 1.1 - fillColor: Theme.backgroundPrimary - anchors.top: parent.top - offsetX: activeWindowTitleContainer.width - 34 - offsetY: -1 - } - - Corners { - id: activeCornerLeft - position: "bottomright" - size: 1.1 - fillColor: Theme.backgroundPrimary - anchors.top: parent.top - offsetX: 34 - offsetY: -1 - } - } - } } } diff --git a/Bar/Modules/Applauncher.qml b/Bar/Modules/Applauncher.qml index 174364b..8e58320 100644 --- a/Bar/Modules/Applauncher.qml +++ b/Bar/Modules/Applauncher.qml @@ -830,34 +830,6 @@ PanelWithOverlay { } } } - - Loader { - active: Settings.settings.showCorners - anchors.top: parent.top - anchors.left: parent.left - anchors.right: parent.right - sourceComponent: Item { - Corners { - id: launcherCornerRight - position: "bottomleft" - size: 1.1 - fillColor: Theme.backgroundPrimary - anchors.top: parent.top - offsetX: 427 - offsetY: 0 - } - - Corners { - id: launcherCornerLeft - position: "bottomright" - size: 1.1 - fillColor: Theme.backgroundPrimary - anchors.top: parent.top - offsetX: -427 - offsetY: 0 - } - } - } } } } \ No newline at end of file diff --git a/Components/Corners.qml b/Components/Corner.qml similarity index 100% rename from Components/Corners.qml rename to Components/Corner.qml diff --git a/Widgets/LockScreen/LockScreen.qml b/Widgets/LockScreen/LockScreen.qml index b6ab0a7..adf524c 100644 --- a/Widgets/LockScreen/LockScreen.qml +++ b/Widgets/LockScreen/LockScreen.qml @@ -294,35 +294,6 @@ WlSessionLock { } } - Loader { - active: Settings.settings.showCorners - anchors.fill: parent - - sourceComponent: Item { - Corners { - id: topRightCorner - position: "bottomleft" - size: 1.3 - fillColor: (Theme.backgroundPrimary !== undefined && Theme.backgroundPrimary !== null) ? Theme.backgroundPrimary : "#222" - offsetX: screen.width / 2 + 53 - offsetY: 0 - anchors.top: parent.top - z: 50 - } - - Corners { - id: topLeftCorner - position: "bottomright" - size: 1.3 - fillColor: (Theme.backgroundPrimary !== undefined && Theme.backgroundPrimary !== null) ? Theme.backgroundPrimary : "#222" - offsetX: -Screen.width / 2 - 53 - offsetY: 0 - anchors.top: parent.top - z: 51 - } - } - } - Rectangle { width: infoColumn.width + 32 * Theme.scale(Screen) height: infoColumn.height + 8 * Theme.scale(Screen) diff --git a/Widgets/SettingsWindow/Tabs/General.qml b/Widgets/SettingsWindow/Tabs/General.qml index 5cbc059..5600558 100644 --- a/Widgets/SettingsWindow/Tabs/General.qml +++ b/Widgets/SettingsWindow/Tabs/General.qml @@ -134,7 +134,7 @@ ColumnLayout { ToggleOption { label: "Show Corners" - description: "Display rounded corners" + description: "Display rounded corners on the edge of the screen" value: Settings.settings.showCorners onToggled: function() { Settings.settings.showCorners = !Settings.settings.showCorners; diff --git a/Widgets/SidePanel/PanelPopup.qml b/Widgets/SidePanel/PanelPopup.qml index a3dbf86..af2cc3a 100644 --- a/Widgets/SidePanel/PanelPopup.qml +++ b/Widgets/SidePanel/PanelPopup.qml @@ -382,59 +382,7 @@ PanelWithOverlay { } - Loader { - active: Settings.settings.showCorners - anchors.fill: parent - - sourceComponent: Item { - Corners { - id: sidebarCornerLeft - - position: "bottomright" - size: 1.1 - fillColor: Theme.backgroundPrimary - anchors.top: parent.top - offsetX: -464 + sidebarPopupRect.slideOffset - offsetY: 0 - - Behavior on offsetX { - enabled: !sidebarPopupRect.isAnimating - - NumberAnimation { - duration: 300 - easing.type: Easing.OutCubic - } - - } - - } - - Corners { - id: sidebarCornerBottom - - position: "bottomright" - size: 1.1 - fillColor: Theme.backgroundPrimary - anchors.bottom: sidebarPopupRect.bottom - offsetX: 33 + sidebarPopupRect.slideOffset - offsetY: 46 - - Behavior on offsetX { - enabled: !sidebarPopupRect.isAnimating - - NumberAnimation { - duration: 300 - easing.type: Easing.OutCubic - } - - } - - } - - } - - } - + } }