Merge pull request #7 from rlxone/feature/improve-cells-ui-for-low-dpi

Improve cells UI for low dpi
rlxone · Nov 25, 2021 · 70f91d7 · 70f91d7
2 parents b7902a0 + 08f464f
commit 70f91d7
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 12 deletions.
diff --git a/EquinoxCore/EquinoxCore/Cores/StorageCore.swift b/EquinoxCore/EquinoxCore/Cores/StorageCore.swift
@@ -38,7 +38,7 @@ public protocol StorageCore {
 
 // MARK: - Class
 
-public class StorageCoreImpl: StorageCore {
+public final class StorageCoreImpl: StorageCore {
     private let userDefaults: UserDefaults
 
     // MARK: - Initializer

diff --git a/EquinoxUI/EquinoxUI/Views/Common/BottomBarView.swift b/EquinoxUI/EquinoxUI/Views/Common/BottomBarView.swift
@@ -52,7 +52,7 @@ extension BottomBarView {
 
 // MARK: - Class
 
-public class BottomBarView: VisualEffectView {
+public final class BottomBarView: VisualEffectView {
     private lazy var button = PushButton()
     private lazy var lineView = LineView()
 

diff --git a/EquinoxUI/EquinoxUI/Views/Common/PushButton.swift b/EquinoxUI/EquinoxUI/Views/Common/PushButton.swift
@@ -90,7 +90,7 @@ extension PushButton {
 
 // MARK: - Class
 
-public class PushButton: Button {
+public final class PushButton: Button {
     private var isMouseDown = false
     private lazy var titleLabel = Label()
     private lazy var imageView = ImageView()

diff --git a/EquinoxUI/EquinoxUI/Views/Common/RoundedPushButton.swift b/EquinoxUI/EquinoxUI/Views/Common/RoundedPushButton.swift
@@ -88,7 +88,7 @@ extension RoundedPushButton {
 
 // MARK: - Class
 
-public class RoundedPushButton: Button {
+public final class RoundedPushButton: Button {
     private var isMouseDown = false
     private lazy var titleLabel = Label()
     private lazy var imageView = ImageView()

diff --git a/EquinoxUI/EquinoxUI/Views/Common/SubMenuPopUpButton.swift b/EquinoxUI/EquinoxUI/Views/Common/SubMenuPopUpButton.swift
@@ -46,7 +46,7 @@ extension SubMenuPopUpButton {
 
 // MARK: - Class
 
-public class SubMenuPopUpButton: NSPopUpButton {
+public final class SubMenuPopUpButton: NSPopUpButton {
     public override init(frame frameRect: NSRect) {
         super.init(frame: frameRect)
         setup()

diff --git a/EquinoxUI/EquinoxUI/Views/Common/SubMenuPopUpButtonCell.swift b/EquinoxUI/EquinoxUI/Views/Common/SubMenuPopUpButtonCell.swift
@@ -28,7 +28,7 @@
 
 import AppKit
 
-public class SubMenuPopUpButtonCell: NSPopUpButtonCell {
+public final class SubMenuPopUpButtonCell: NSPopUpButtonCell {
     public var selectedTitle: String?
 
     public override func drawTitle(_ title: NSAttributedString, withFrame frame: NSRect, in controlView: NSView) -> NSRect {

diff --git a/EquinoxUI/EquinoxUI/Views/Content/Tip/TipContentView.swift b/EquinoxUI/EquinoxUI/Views/Content/Tip/TipContentView.swift
@@ -87,7 +87,7 @@ extension TipContentView {
 
 // MARK: - Class
 
-public class TipContentView: View {
+public final class TipContentView: View {
     private lazy var titleLabel = StyledLabel()
     private lazy var descriptionLabel = StyledLabel()
     private lazy var imageView = ImageView()

diff --git a/EquinoxUI/EquinoxUI/Views/Content/Wallpaper/Create/CreateAnimatedImageView.swift b/EquinoxUI/EquinoxUI/Views/Content/Wallpaper/Create/CreateAnimatedImageView.swift
@@ -48,7 +48,7 @@ extension CreateAnimatedImageView {
 
 // MARK: - Class
 
-public class CreateAnimatedImageView: View {
+public final class CreateAnimatedImageView: View {
     private lazy var animatedImageView = DragAnimatedImageView()
 
     private lazy var borderView: BorderProgressView = {

diff --git a/EquinoxUI/EquinoxUI/Views/Content/Wallpaper/Gallery/GalleryCollectionLayout.swift b/EquinoxUI/EquinoxUI/Views/Content/Wallpaper/Gallery/GalleryCollectionLayout.swift
@@ -94,7 +94,7 @@ public final class GalleryCollectionLayout: NSCollectionViewFlowLayout {
         let usefulWidth = CGFloat(width - inset) - padding
         let width = usefulWidth / CGFloat(itemsPerRow)
 
-        return width
+        return floor(width)
     }
 
     private func calculateItemHeight(for width: CGFloat) -> CGFloat {
@@ -115,7 +115,7 @@ public final class GalleryCollectionLayout: NSCollectionViewFlowLayout {
             height = width * Constants.imageAspect
         }
 
-        return height
+        return ceil(height)
     }
 
     private func calculateRowItemsCount(for count: Int) -> Int {

diff --git a/EquinoxUI/EquinoxUI/Views/Content/Wallpaper/Set/SetContentView.swift b/EquinoxUI/EquinoxUI/Views/Content/Wallpaper/Set/SetContentView.swift
@@ -115,7 +115,7 @@ extension SetContentView {
 
 // MARK: - Class
 
-public class SetContentView: View {
+public final class SetContentView: View {
     private lazy var titleLabel = StyledLabel()
     private lazy var descriptionLabel = StyledLabel()
     private lazy var imageView = ImageView()

diff --git a/EquinoxUI/EquinoxUI/Windows/TooltipWindow.swift b/EquinoxUI/EquinoxUI/Windows/TooltipWindow.swift
@@ -57,7 +57,7 @@ extension TooltipWindow {
 
 // MARK: - Class
 
-public class TooltipWindow: NSWindow {
+public final class TooltipWindow: NSWindow {
     public init() {
         super.init(
             contentRect: .zero,