diff --git a/LrcMaker/Base.lproj/MainWindow.xib b/LrcMaker/Base.lproj/MainWindow.xib index dddccfd..43e9197 100644 --- a/LrcMaker/Base.lproj/MainWindow.xib +++ b/LrcMaker/Base.lproj/MainWindow.xib @@ -378,7 +378,7 @@ IA - + diff --git a/Lyrics/Base.lproj/LyricsEditWindow.xib b/Lyrics/Base.lproj/LyricsEditWindow.xib index a76b740..788cf71 100644 --- a/Lyrics/Base.lproj/LyricsEditWindow.xib +++ b/Lyrics/Base.lproj/LyricsEditWindow.xib @@ -1,8 +1,8 @@ - + - + @@ -25,7 +25,6 @@ - diff --git a/Lyrics/Base.lproj/StatusMenu.xib b/Lyrics/Base.lproj/StatusMenu.xib index b2941cd..bdc8e9a 100644 --- a/Lyrics/Base.lproj/StatusMenu.xib +++ b/Lyrics/Base.lproj/StatusMenu.xib @@ -1,8 +1,8 @@ - + - + @@ -152,7 +152,6 @@ - @@ -161,7 +160,6 @@ - @@ -183,7 +181,6 @@ - @@ -192,7 +189,6 @@ - @@ -204,7 +200,6 @@ - diff --git a/Lyrics/LyricsWindowController.swift b/Lyrics/LyricsWindowController.swift index 705eee0..168d32b 100644 --- a/Lyrics/LyricsWindowController.swift +++ b/Lyrics/LyricsWindowController.swift @@ -60,7 +60,7 @@ class LyricsWindowController: NSWindowController { backgroundLayer.anchorPoint = CGPointZero backgroundLayer.position = CGPointMake(0, 0) - backgroundLayer.cornerRadius = 20 + backgroundLayer.cornerRadius = 12 firstLyricsLayer.anchorPoint = CGPointZero firstLyricsLayer.position = CGPointMake(0, 0) @@ -333,7 +333,11 @@ class LyricsWindowController: NSWindowController { backgroundLayer.hidden = false let attributedStr: NSMutableAttributedString = NSMutableAttributedString(string: firstLyrics as! String, attributes: attrs) - attributedStr.addAttribute(kCTVerticalFormsAttributeName as String, value: NSNumber(bool: true), range: NSMakeRange(0, attributedStr.length)) + for var i=0; i Bool { + let char: UnsafePointer = character.UTF8String + if strlen(char) == 3 { + return true + } else { + return false + } + } } diff --git a/Lyrics/TextPreview.swift b/Lyrics/TextPreview.swift index 3dd0c40..7b8f6ee 100644 --- a/Lyrics/TextPreview.swift +++ b/Lyrics/TextPreview.swift @@ -54,7 +54,7 @@ class TextPreview: NSView { // draw background layer let strRect: NSRect = NSMakeRect(strOrigin.x - 25, strOrigin.y, strSize.width + 50, strSize.height) - let path:NSBezierPath = NSBezierPath(roundedRect: strRect, xRadius: 20, yRadius: 20) + let path:NSBezierPath = NSBezierPath(roundedRect: strRect, xRadius: 12, yRadius: 12) backgroundColor.set() path.fill() diff --git a/README.md b/README.md index fd449f6..fa2123f 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ Swift-based iTunes plug-in app to display lyrics on the desktop. ![lrcseeker] (http://i67.tinypic.com/14xiccp.jpg) -* Build-In LrcMaker to make lrc by yourself +* Build-In LrcMaker to make lrc by yourself. ![lrcmaker-1] @@ -49,11 +49,11 @@ Swift-based iTunes plug-in app to display lyrics on the desktop. * Auto launches with iTunes or user login. ###System Requirement -* Mac OS X 10.9 (Mavericks) or above +* Mac OS X 10.9 (Mavericks) or above. ###Build Requirement -* Mac OS X 10.11 (El Capitan) or above -* Xcode 7.0 or above +* Mac OS X 10.11 (El Capitan) or above. +* Xcode 7.0 or above. ###Third Party Library & Frameworks * [OpenCC](https://github.com/BYVoid/OpenCC) @@ -61,3 +61,8 @@ Swift-based iTunes plug-in app to display lyrics on the desktop. ###Special Thanks * [DynamicLyrics Project](https://github.com/MartianZ/DynamicLyrics) + +###To-do List +* Using Core Text to display vertical lyrics. +* In const lyrics layout mode, you can move around lyrics window. +* Improve Two-Line mode(clip one into two when lyric is too long). \ No newline at end of file