Skip to content

Fixed wrong image size on retina with external monitor #2

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

Open
leoMehlig wants to merge 1 commit into
base: icon_version_rendering
Choose a base branch
from
Open

Fixed wrong image size on retina with external monitor #2

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
25 changes: 19 additions & 6 deletions Scripts/icon_processor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@ import Accelerate
import CoreGraphics

func image(withImage image:NSImage, buildVersion:String, buildNumber:String, buildType:String) -> NSImage {
//Generate blured image
let imageScale = image.recommendedLayerContentsScale(1)
let screenScale = NSScreen.mainScreen()!.backingScaleFactor
let size = CGSize(width: image.size.width / screenScale * imageScale, height: image.size.height / screenScale * imageScale)
let imageScale: CGFloat = image.recommendedLayerContentsScale(1)
let size = CGSize(width: image.size.width * imageScale, height: image.size.height * imageScale)

let bluredImage = image.applyBlurWithRadius(size.width * 0.1, tintColor: NSColor(white: 0.11, alpha: 0.3), saturationDeltaFactor: 1.8)
let bounds = CGRect(origin: CGPointZero, size: size)
Expand Down Expand Up @@ -66,8 +64,23 @@ public extension String {

public extension NSImage {
public func saveAsPNGatPath(path:String, atomically: Bool = true) -> Bool {
let data = self.TIFFRepresentationUsingCompression(NSTIFFCompression.None, factor: 1.0)!
let bitmap = NSBitmapImageRep(data: data)!
let bitmap = NSBitmapImageRep(
bitmapDataPlanes: nil,
pixelsWide: Int(self.size.width),
pixelsHigh: Int(self.size.height),
bitsPerSample: 8,
samplesPerPixel: 4,
hasAlpha: true,
isPlanar: false,
colorSpaceName: NSCalibratedRGBColorSpace,
bytesPerRow: 0,
bitsPerPixel: 0)!
bitmap.size = self.size

NSGraphicsContext.saveGraphicsState()
NSGraphicsContext.setCurrentContext(NSGraphicsContext(bitmapImageRep: bitmap))
self.drawInRect(CGRect(origin: CGPoint(), size: size), fromRect: CGRect(), operation: .CompositeCopy, fraction: 1.0)
NSGraphicsContext.restoreGraphicsState()
if let imagePGNData: NSData = bitmap.representationUsingType(NSBitmapImageFileType.NSPNGFileType, properties: [NSImageCompressionFactor: 1.0]) {
return imagePGNData.writeToFile(NSString(string: path).stringByStandardizingPath, atomically: atomically)
} else {
Expand Down