Skip to content
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

Fix widget wizard rect bug #668

Merged
merged 1 commit into from
Sep 29, 2023
Merged

Fix widget wizard rect bug #668

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
6 changes: 4 additions & 2 deletions Mlem/Models/Settings/LayoutWidgets/LayoutWidgetCollection.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,10 @@ class OrderedWidgetCollection: FiniteWidgetCollection {
}

override func addTo(_ widget: LayoutWidget) {
items.insert(widget, at: predictedDropIndex!)
itemsWithPlaceholder = items
if let index = predictedDropIndex {
items.insert(widget, at: index)
itemsWithPlaceholder = items
}
}

func updatePlaceholderPosition(widgetDragging: LayoutWidget, index: Int) {
Expand Down
5 changes: 3 additions & 2 deletions Mlem/Views/Tabs/Settings/Components/Views/Appearance/Shared/LayoutWidgetEditView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ struct LayoutWidgetEditView: View {
.frame(maxWidth: .infinity, maxHeight: .infinity)
.onAppear {
barCollection.rect = geo.frame(in: .global)
.offsetBy(dx: 0, dy: -outerFrame.origin.y)
.offsetBy(dx: -outerFrame.origin.x, dy: -outerFrame.origin.y)
.insetBy(dx: -20, dy: -60)
}
}
Expand Down Expand Up @@ -186,8 +186,9 @@ struct LayoutWidgetEditView: View {
Color.clear
.frame(maxWidth: .infinity, maxHeight: .infinity)
.onAppear {

trayCollection.rect = geo.frame(in: .global)
.offsetBy(dx: 0, dy: -outerFrame.origin.y - 90)
.offsetBy(dx: -outerFrame.origin.x, dy: -outerFrame.origin.y - 90)
}
}
}
Expand Down