Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions qml/FullscreenFrame.qml
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ InputEventItem {
}
}
// TODO: this might not be the correct way to handle wheel
onWheel: {
onWheel: function(wheel) {
if (flipPageDelay.running) return
let xDelta = wheel.angleDelta.x / 8
let yDelta = wheel.angleDelta.y / 8
Expand Down Expand Up @@ -346,7 +346,7 @@ InputEventItem {
MouseArea {
anchors.fill: parent
acceptedButtons: Qt.RightButton | Qt.LeftButton
onClicked: {
onClicked: function(mouse) {
// FIXME: prevent the bug:https://bugreports.qt.io/browse/QTBUG-125139;
if (mouse.button === Qt.RightButton) {
mouse.accepted = false;
Expand Down Expand Up @@ -672,7 +672,7 @@ InputEventItem {
}

Keys.forwardTo: [searchEdit]
Keys.onPressed: {
Keys.onPressed: function(event) {
if (baseLayer.focus === true) {
// the SearchEdit will catch the key event first, and events that it won't accept will then got here
switch (event.key) {
Expand Down
4 changes: 3 additions & 1 deletion qml/windowed/AppList.qml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ ColumnLayout {
}

function resetViewState() {
loader.item.resetViewState()
if (CategorizedSortProxyModel.categoryType !== CategorizedSortProxyModel.FreeCategory) {
loader.item.resetViewState()
}
}

function switchToFreeSort(freeSort) {
Expand Down
2 changes: 1 addition & 1 deletion qml/windowed/AppListView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ FocusScope {
Drag.dragType: Drag.Automatic
Drag.mimeData: Helper.generateDragMimeData(model.desktopId, true)
Drag.hotSpot.y: height / 2
Drag.hotSpot.x: Drag.hotSpot.y
Drag.hotSpot.x: width / 2

states: State {
name: "dragged";
Expand Down