fix: layout regression introduced by eed0353
This commit is contained in:
1 parent
3fc899eeda
commit
bdc41bea46
1 file changed
+12
-15
@@ -1,6 +1,6 @@
|
|||||||
import Cocoa
|
import Cocoa
|
||||||
|
|
||||||
class CollectionViewItemView: NSView {
|
class CollectionViewItemView: NSStackView {
|
||||||
var window_: Window?
|
var window_: Window?
|
||||||
var thumbnail = NSImageView()
|
var thumbnail = NSImageView()
|
||||||
var appIcon = NSImageView()
|
var appIcon = NSImageView()
|
||||||
@@ -15,12 +15,11 @@ class CollectionViewItemView: NSView {
|
|||||||
convenience init() {
|
convenience init() {
|
||||||
self.init(frame: .zero)
|
self.init(frame: .zero)
|
||||||
let hStackView = makeHStackView()
|
let hStackView = makeHStackView()
|
||||||
let vStackView = makeVStackView(hStackView)
|
setupView(hStackView)
|
||||||
let shadow = CollectionViewItemView.makeShadow(.gray)
|
let shadow = CollectionViewItemView.makeShadow(.gray)
|
||||||
thumbnail.shadow = shadow
|
thumbnail.shadow = shadow
|
||||||
appIcon.shadow = shadow
|
appIcon.shadow = shadow
|
||||||
observeDragAndDrop()
|
observeDragAndDrop()
|
||||||
subviews.append(vStackView)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private func observeDragAndDrop() {
|
private func observeDragAndDrop() {
|
||||||
@@ -151,18 +150,16 @@ class CollectionViewItemView: NSView {
|
|||||||
return hStackView
|
return hStackView
|
||||||
}
|
}
|
||||||
|
|
||||||
private func makeVStackView(_ hStackView: NSStackView) -> NSStackView {
|
private func setupView(_ hStackView: NSStackView) {
|
||||||
let vStackView = NSStackView()
|
wantsLayer = true
|
||||||
vStackView.wantsLayer = true
|
layer!.backgroundColor = .clear
|
||||||
vStackView.layer!.backgroundColor = .clear
|
layer!.cornerRadius = Preferences.cellCornerRadius
|
||||||
vStackView.layer!.cornerRadius = Preferences.cellCornerRadius
|
layer!.borderWidth = Preferences.cellBorderWidth
|
||||||
vStackView.layer!.borderWidth = Preferences.cellBorderWidth
|
layer!.borderColor = .clear
|
||||||
vStackView.layer!.borderColor = .clear
|
edgeInsets = NSEdgeInsets(top: Preferences.intraCellPadding, left: Preferences.intraCellPadding, bottom: Preferences.intraCellPadding, right: Preferences.intraCellPadding)
|
||||||
vStackView.edgeInsets = NSEdgeInsets(top: Preferences.intraCellPadding, left: Preferences.intraCellPadding, bottom: Preferences.intraCellPadding, right: Preferences.intraCellPadding)
|
orientation = .vertical
|
||||||
vStackView.orientation = .vertical
|
spacing = Preferences.intraCellPadding
|
||||||
vStackView.spacing = Preferences.intraCellPadding
|
setViews([hStackView, thumbnail], in: .leading)
|
||||||
vStackView.setViews([hStackView, thumbnail], in: .leading)
|
|
||||||
return vStackView
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user