GitHub/Menu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17 from iSapozhnik/feature/hover-insets

Browse Source 
Appearance
This commit is contained in:
Sapozhnik Ivan
2020-05-14 19:23:45 +02:00
committed by GitHub
parent 971fd9d77f 622cad7feb
commit e1950e0352
3 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/Menu/Menu.swift
+21 -2
View File
@@ -65,6 +65,14 @@ public final class Menu {
item.action?()
}
public func selectItem(withTitle title: String) {
guard let item = items.first(where: { item -> Bool in
item.title == title
}) else { return }
selectedId = item.id
item.action?()
}
// MARK: - Adding and Removing Menu Items
public func insertItem(_ item: MenuItem, at index: Int) {
items.insert(item, at: index)
@@ -218,12 +226,23 @@ public final class Menu {
guard let parentWindow = view.window, let topMostSuperView = parentWindow.contentView else { return }
let locationInWindow = view.convert(topMostSuperView.frame.origin, to: nil)
let rectInWindow = NSRect(origin: locationInWindow, size: CGSize(width: NSWidth(view.frame), height: NSHeight(window.frame)))
let rectInWindow = NSRect(origin: locationInWindow, size: CGSize(width: NSWidth(view.frame), height: NSHeight(view.frame)))
let rectInScreen = parentWindow.convertToScreen(rectInWindow)
let origin = rectInScreen.origin
var additionalYOffset = configuration.appearsBelowSender ? NSHeight(view.frame) : 0
additionalYOffset += abs(configuration.presentingOffset)
let newFrame = NSRect(x: origin.x, y: origin.y - NSHeight(window.frame) - additionalYOffset, width: NSWidth(view.frame), height: NSHeight(window.frame))
let newFrame: NSRect
switch configuration.appearancePosition {
case .rightBottom:
newFrame = NSRect(x: origin.x, y: origin.y - NSHeight(window.frame) - additionalYOffset, width: NSWidth(view.frame), height: NSHeight(window.frame))
case .rightTop:
newFrame = NSRect(x: origin.x, y: origin.y + additionalYOffset, width: NSWidth(view.frame), height: NSHeight(window.frame))
case .leftTop:
newFrame = NSRect(x: origin.x - NSWidth(window.frame) + NSWidth(view.frame), y: origin.y - additionalYOffset, width: NSWidth(view.frame), height: NSHeight(window.frame))
case .leftBottom:
newFrame = NSRect(x: origin.x - NSWidth(window.frame) + NSWidth(view.frame), y: origin.y - NSHeight(window.frame) - additionalYOffset, width: NSWidth(view.frame), height: NSHeight(window.frame))
}
window.setFrame(newFrame, display: true, animate: false)
}
Sources/Menu/MenuConfiguration.swift
+12
View File
@@ -12,6 +12,13 @@ public enum Alignment {
case right
}
public enum Position {
case leftBottom
case leftTop
case rightTop
case rightBottom
}
public enum Padding {
public struct Horizontal {
let left: CGFloat
@@ -54,6 +61,7 @@ public protocol Configuration {
var cornerRadius: CGFloat { get }
var hasShadow: Bool { get }
var appearsBelowSender: Bool { get }
var appearancePosition: Position { get }
var presentingOffset: CGFloat { get }
var animationDuration: TimeInterval { get }
var contentEdgeInsets: NSEdgeInsets { get }
@@ -114,6 +122,10 @@ open class MenuConfiguration: Configuration {
return true
}
open var appearancePosition: Position {
return .rightBottom
}
open var presentingOffset: CGFloat {
return 0.0
}
Sources/Menu/MenuElement.swift
+6 -4
View File
@@ -208,10 +208,12 @@ class MenuElement: NSView {
control.isEnabled = isEnabled
control.hover = { [weak self] isHover in
guard let self = self else { return }
label.textColor = isHover ? self.configuration.menuItemHoverTextColor : isSelected ? self.configuration.menuItemHoverImageTintColor : self.configuration.menuItemTextColor
if #available(OSX 10.14, *) {
leftImageView?.contentTintColor = isHover ? self.configuration.menuItemHoverImageTintColor : isSelected ? self.configuration.menuItemHoverImageTintColor : self.configuration.menuItemImageTintColor
rightImageView?.contentTintColor = isHover ? self.configuration.menuItemHoverImageTintColor : isSelected ? self.configuration.menuItemHoverImageTintColor : self.configuration.menuItemImageTintColor
if self.configuration.rememberSelection {
label.textColor = isHover ? self.configuration.menuItemHoverTextColor : isSelected ? self.configuration.menuItemHoverImageTintColor : self.configuration.menuItemTextColor
if #available(OSX 10.14, *) {
leftImageView?.contentTintColor = isHover ? self.configuration.menuItemHoverImageTintColor : isSelected ? self.configuration.menuItemHoverImageTintColor : self.configuration.menuItemImageTintColor
rightImageView?.contentTintColor = isHover ? self.configuration.menuItemHoverImageTintColor : isSelected ? self.configuration.menuItemHoverImageTintColor : self.configuration.menuItemImageTintColor
}
}
}