Skip to content

fix(dock): eliminate several QML runtime/compile warnings #1706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mhduiy wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

fix(dock): eliminate several QML runtime/compile warnings #1706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions panels/dock/ShellSurfaceItemProxy.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ Item {
}

Connections {
ignoreUnknownSignals: true
target: shellSurface
// TODO it's maybe a bug for qt, we force shellSurface's value to update
function onAboutToDestroy()
Expand Down
2 changes: 1 addition & 1 deletion panels/dock/taskmanager/package/AppItem.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ Item {
if (mouse.button === Qt.LeftButton) {
appItem.grabToImage(function(result) {
root.Drag.imageSource = result.url;
})
}, Qt.size(appItem.width, appItem.height))
}
toolTip.close()
closeItemPreview()
Expand Down
28 changes: 14 additions & 14 deletions panels/dock/taskmanager/package/TaskManager.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,16 @@ ContainmentItem {
readonly property real startPadding: Math.max(0, appTitleSpacing - (Panel.rootObject.dockItemMaxSize * (multitaskViewIconRatio - iconWidthToMaxSizeRatio) / 2))

implicitWidth: {
let extra = useColumnLayout ? 0 : startPadding
if (useColumnLayout) return Panel.rootObject.dockSize
let extra = startPadding
let w = appContainer.implicitWidth + extra
let maxW = Panel.itemAlignment === Dock.LeftAlignment ? Math.max(remainingSpacesForTaskManager, w) : Math.min(remainingSpacesForTaskManager, w)
return useColumnLayout ? Panel.rootObject.dockSize : maxW
return Panel.itemAlignment === Dock.LeftAlignment ? Math.max(remainingSpacesForTaskManager, w) : Math.min(remainingSpacesForTaskManager, w)
}
implicitHeight: {
let extra = useColumnLayout ? startPadding : 0
if (!useColumnLayout) return Panel.rootObject.dockSize
let extra = startPadding
let h = appContainer.implicitHeight + extra
let maxH = Panel.itemAlignment === Dock.LeftAlignment ? Math.max(remainingSpacesForTaskManager, h) : Math.min(remainingSpacesForTaskManager, h)
return useColumnLayout ? maxH : Panel.rootObject.dockSize
return Panel.itemAlignment === Dock.LeftAlignment ? Math.max(remainingSpacesForTaskManager, h) : Math.min(remainingSpacesForTaskManager, h)
}
// Helper function to find the current index of an app by its appId in the visualModel
function findAppIndex(appId) {
Expand Down Expand Up @@ -114,6 +114,14 @@ ContainmentItem {
duration: 200
}
}
add: Transition {
NumberAnimation {
properties: "scale,opacity"
from: 0
to: 1
duration: 200
}
}
model: DelegateModel {
id: visualModel
model: taskmanager.Applet.dataModel
Expand All @@ -140,14 +148,6 @@ ContainmentItem {
return windows.length > 0 && launcherDndDropArea.launcherDndWinId !== windows[0]
}

ListView.onAdd: NumberAnimation {
target: delegateRoot
properties: "scale,opacity"
from: 0
to: 1
duration: 200
}

states: [
State {
name: "item-visible"
Expand Down
4 changes: 2 additions & 2 deletions panels/dock/tray/package/ActionLegacyTrayPluginDelegate.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ AppletItemButton {
if (Qt.platform.pluginName !== "xcb") {
root.grabToImage(function(result) {
root.Drag.imageSource = result.url;
})
}, Qt.size(root.width, root.height))
}

if (!Drag.active) {
Expand All @@ -194,7 +194,7 @@ AppletItemButton {
if (Qt.platform.pluginName !== "xcb") {
root.grabToImage(function(result) {
root.Drag.imageSource = result.url;
})
}, Qt.size(root.width, root.height))
}
}

Expand Down
2 changes: 1 addition & 1 deletion panels/dock/tray/quickpanel/DragItem.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ Item {

draggingImage = result.url
Qt.callLater(function() { dragItem.Drag.active = true })
})
}, Qt.size(dragItem.width, dragItem.height))
} else {
dragItem.Drag.active = false
}
Expand Down
2 changes: 1 addition & 1 deletion panels/dock/tray/trayitempositionmanager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ struct DropIndex {
Q_PROPERTY(int index MEMBER index)
Q_PROPERTY(bool isOnItem MEMBER isOnItem)
Q_PROPERTY(bool isBefore MEMBER isBefore)
QML_ELEMENT
QML_NAMED_ELEMENT(dropIndex)
public:
int index;
bool isOnItem = true;
Expand Down
2 changes: 1 addition & 1 deletion panels/notification/center/OverlapNotify.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ NotifyItem {

OverlapIndicator {
id: indicator
enableAnimation: root.ListView.view.panelShown
enableAnimation: (root.ListView.view && root.ListView.view.panelShown) ?? false
clipItems: true
anchors {
bottom: parent.bottom
Expand Down
Loading