Commit 6c8a6cfe by Daniel Dahan

issue-1052: Minor stylistic updates to code changes.

parent f30c239a
...@@ -232,7 +232,7 @@ open class NavigationDrawerController: TransitionController { ...@@ -232,7 +232,7 @@ open class NavigationDrawerController: TransitionController {
*/ */
open var isDimEnabled = true { open var isDimEnabled = true {
didSet { didSet {
self.updateDim() updateDim()
} }
} }
...@@ -240,12 +240,13 @@ open class NavigationDrawerController: TransitionController { ...@@ -240,12 +240,13 @@ open class NavigationDrawerController: TransitionController {
The alpha value of the rootViewController when left/right drawer The alpha value of the rootViewController when left/right drawer
is presented, the value should be between 0.0 - 1.0. Defaults is 0.5 is presented, the value should be between 0.0 - 1.0. Defaults is 0.5
*/ */
open var dimAmount: CGFloat = 0.5 { open var dimValue: CGFloat = 0.5 {
didSet { didSet {
if dimAmount < 0.0 || dimAmount > 1.0 { if 0 > dimValue || 1 < dimValue {
dimAmount = 0.5 dimValue = 0.5
} }
self.updateDim()
updateDim()
} }
} }
...@@ -801,7 +802,6 @@ open class NavigationDrawerController: TransitionController { ...@@ -801,7 +802,6 @@ open class NavigationDrawerController: TransitionController {
} }
self.isAnimating = false self.isAnimating = false
self.delegate?.navigationDrawerController?(navigationDrawerController: self, didOpen: .right) self.delegate?.navigationDrawerController?(navigationDrawerController: self, didOpen: .right)
} }
} }
...@@ -895,7 +895,7 @@ open class NavigationDrawerController: TransitionController { ...@@ -895,7 +895,7 @@ open class NavigationDrawerController: TransitionController {
self.isAnimating = false self.isAnimating = false
self.isUserInteractionEnabled = true self.isUserInteractionEnabled = true
self.delegate?.navigationDrawerController?(navigationDrawerController: self, didClose: .right) self.delegate?.navigationDrawerController?(navigationDrawerController: self, didClose: .right)
} }
} }
...@@ -1064,13 +1064,16 @@ open class NavigationDrawerController: TransitionController { ...@@ -1064,13 +1064,16 @@ open class NavigationDrawerController: TransitionController {
fileprivate func updateDim() { fileprivate func updateDim() {
if isDimEnabled { if isDimEnabled {
if isOpened { if isOpened {
self.rootViewController.view.alpha = 1.0 rootViewController.view.alpha = 1.0
} else { } else {
self.rootViewController.view.alpha = self.dimAmount rootViewController.view.alpha = dimValue
} }
return return
} }
self.rootViewController.view.alpha = 1.0
rootViewController.view.alpha = 1.0
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment