yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

plugins/overview: Linearize desktops in the desktop bar when using non linear desktop layout

Browse source 
Hiding the desktop bar based on the desktop layout produces unexpected
results.

BUG: 482023
This commit is contained in:
Vlad Zahorodnii 2024-02-29 15:54:51 +02:00
parent 51cb1baf1b
commit b825d5fdc3
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/plugins/overview/qml/main.qml
View file

@ -32,7 +32,6 @@ FocusScope {
property bool organized: false property bool organized: false
property bool verticalDesktopBar: KWinComponents.Workspace.desktopGridHeight >= bar.desktopCount && KWinComponents.Workspace.desktopGridHeight != 1 property bool verticalDesktopBar: KWinComponents.Workspace.desktopGridHeight >= bar.desktopCount && KWinComponents.Workspace.desktopGridHeight != 1
property bool anyDesktopBar: verticalDesktopBar || KWinComponents.Workspace.desktopGridHeight == 1
// The values of overviewVal and gridVal might not be 0 on startup, // The values of overviewVal and gridVal might not be 0 on startup,
// but we always want to animate from 0 to those values. So, we initially // but we always want to animate from 0 to those values. So, we initially
@ -272,7 +271,6 @@ FocusScope {
Item { Item {
id: desktopBar id: desktopBar
visible: container.anyDesktopBar
// (overviewVal, gridVal) represents the state of the overview // (overviewVal, gridVal) represents the state of the overview
// in a 2D coordinate plane. Math.atan2 returns the angle between // in a 2D coordinate plane. Math.atan2 returns the angle between
@ -308,7 +306,7 @@ FocusScope {
opacity: desktopBar.opacity opacity: desktopBar.opacity
anchors.left: container.verticalDesktopBar ? desktopBar.right : parent.left anchors.left: container.verticalDesktopBar ? desktopBar.right : parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.top: container.verticalDesktopBar || !container.anyDesktopBar ? parent.top : desktopBar.bottom anchors.top: container.verticalDesktopBar ? parent.top : desktopBar.bottom
anchors.topMargin: Kirigami.Units.largeSpacing anchors.topMargin: Kirigami.Units.largeSpacing
height: searchField.height + 1 * Kirigami.Units.largeSpacing height: searchField.height + 1 * Kirigami.Units.largeSpacing
@ -340,7 +338,7 @@ FocusScope {
// These are the minimum position of maximum size of the desktop preview in the overview // These are the minimum position of maximum size of the desktop preview in the overview
property int minX: Kirigami.Units.largeSpacing + (container.verticalDesktopBar ? desktopBar.width : 0) property int minX: Kirigami.Units.largeSpacing + (container.verticalDesktopBar ? desktopBar.width : 0)
property int minY: Kirigami.Units.largeSpacing + topBar.height + (container.verticalDesktopBar || !container.anyDesktopBar ? 0 : desktopBar.height) property int minY: Kirigami.Units.largeSpacing + topBar.height + (container.verticalDesktopBar ? 0 : desktopBar.height)
property int maxWidth: currentGeometry.width - minX - Kirigami.Units.gridUnit * 2 property int maxWidth: currentGeometry.width - minX - Kirigami.Units.gridUnit * 2
property int maxHeight: currentGeometry.height - minY - Kirigami.Units.gridUnit * 2 property int maxHeight: currentGeometry.height - minY - Kirigami.Units.gridUnit * 2
@ -663,7 +661,6 @@ FocusScope {
gestureInProgress: !Number.isInteger(gridVal) || !Number.isInteger(overviewVal) gestureInProgress: !Number.isInteger(gridVal) || !Number.isInteger(overviewVal)
targetScale: { targetScale: {
if (!container.anyDesktopBar) return targetScale;
if (overviewVal != 1) return targetScale; if (overviewVal != 1) return targetScale;
let coordinate = container.verticalDesktopBar ? 'x' : 'y' let coordinate = container.verticalDesktopBar ? 'x' : 'y'
if (!activeDragHandler.active) { if (!activeDragHandler.active) {