working on UIViewController

Sources/Cacao/NSStringDrawing.swift

@@ -57,7 +57,7 @@ public extension TextAttributes {
             textAttributes.font = font
         }
 
-        if let textColor = (attributes[NSForegroundColorAttributeName] as? UIColor)?.CGColor {
+        if let textColor = (attributes[NSForegroundColorAttributeName] as? UIColor)?.cgColor {
 
             textAttributes.color = textColor
         }

Sources/Cacao/TextRendering.swift

@@ -31,11 +31,11 @@ public extension String {
 
         // calculate frame
 
-        let textWidth = attributes.font.silicaFont.singleLineWidth(text: self, fontSize: attributes.font.size, textMatrix: textMatrix)
+        let textWidth = attributes.font.cgFont.singleLineWidth(text: self, fontSize: attributes.font.size, textMatrix: textMatrix)
 
         let lines = 1
 
-        let textHeight = attributes.font.size * Double(lines)
+        let textHeight = attributes.font.pointSize * Double(lines)
 
         var textRect = Rect(x: bounds.x, y: bounds.y, width: textWidth, height: textHeight) // height == font.size
 
@@ -58,9 +58,9 @@ public struct TextAttributes {
 
     public init() { }
 
-    public var font = Font(name: "Helvetica", size: 17)!
+    public var font = UIFont(name: "Helvetica", size: 17)!
 
-    public var color = Color.black
+    public var color = UIColor.black
 
     public var paragraphStyle = ParagraphStyle()
 }

Sources/Cacao/UIApplication.swift

@@ -91,6 +91,7 @@ public func UIApplicationMain(delegate: UIApplicationDelegate, options: CacaoOpt
                  guard event.button.which != SDL_TOUCH_MOUSEID
                  else { return }*/
 
+                break
                 //screen.handle(event: PointerEvent(event.button))
 
             case SDL_FINGERDOWN, SDL_FINGERUP: break

Sources/Cacao/UIColor.swift

@@ -12,13 +12,13 @@ public final class UIColor {
 
     // MARK: - Properties
 
-    public let CGColor: Color
+    public let cgColor: CGColor
 
     // MARK: - Initialization
 
-    public init(cgColor color: Color) {
+    public init(cgColor color: CGColor) {
 
-        self.CGColor = color
+        self.cgColor = color
     }
 
     /// An initialized color object. The color information represented by this object is in the device RGB colorspace.
@@ -27,7 +27,7 @@ public final class UIColor {
                 blue: Double,
                 alpha: Double = 1.0) {
 
-        self.CGColor = Color(red: red, green: green, blue: blue, alpha: alpha)
+        self.cgColor = Color(red: red, green: green, blue: blue, alpha: alpha)
     }
 
     // MARK: - Methods
@@ -39,10 +39,10 @@ public final class UIColor {
                        blue: inout Double,
                        alpha: inout Double) -> Bool {
 
-        red = CGColor.red
-        green = CGColor.green
-        blue = CGColor.blue
-        alpha = CGColor.alpha
+        red = cgColor.red
+        green = cgColor.green
+        blue = cgColor.blue
+        alpha = cgColor.alpha
 
         return true
     }
@@ -59,13 +59,13 @@ public final class UIColor {
     /// Sets the color of subsequent fill operations to the color that the receiver represents.
     public func setFill() {
 
-        UIGraphicsGetCurrentContext()?.silicaContext.fillColor = CGColor
+        UIGraphicsGetCurrentContext()?.silicaContext.fillColor = cgColor
     }
 
     /// Sets the color of subsequent stroke operations to the color that the receiver represents.
     public func setStroke() {
 
-        UIGraphicsGetCurrentContext()?.silicaContext.strokeColor = CGColor
+        UIGraphicsGetCurrentContext()?.silicaContext.strokeColor = cgColor
     }
 
     // MARK: - Singletons
@@ -87,7 +87,7 @@ extension UIColor: CacaoConvertible {
 
     public func toCacao() -> Silica.Color {
 
-        return CGColor
+        return cgColor
     }
 }
 

Sources/Cacao/UIScreen.swift

@@ -13,7 +13,7 @@ public final class UIScreen {
 
     public static internal(set) var main: UIScreen!
 
-    public static let screens: [UIScreen] = [UIScreen.main]()
+    public static var screens: [UIScreen] { return [UIScreen.main] }
 
     // MARK: - Properties
 
@@ -38,7 +38,7 @@ public final class UIScreen {
 
     internal let window: Window
 
-    internal var size: (window: Size, native: Size)
+    internal var size: (window: Size, native: Size) { didSet { sizeChanged() } }
 
     internal lazy var renderer: Renderer = Renderer(window: self.window).sdlAssert()
 
@@ -66,10 +66,10 @@ public final class UIScreen {
 
         if needsLayout {
 
-
+            windows.forEach { $0.layoutIfNeeded() }
         }
 
-        renderer.drawColor = (0xFF, 0xFF, 0xFF, 0xFF)
+        renderer.drawColor = (0x00, 0x00, 0x00, 0xFF)
 
         // get data for surface
         let imageSurface = Surface(rgb: (Int(size.window.width), Int(size.window.height)), depth: 32).sdlAssert()
@@ -87,6 +87,11 @@ public final class UIScreen {
         needsDisplay = false
         needsLayout = false
     }
+
+    private func sizeChanged() {
+
+
+    }
 }
 
 /*

Sources/Cacao/UIView.swift

@@ -430,17 +430,18 @@ open class UIView {
 
 
 
-    internal final var shouldDrawContent: Bool { return isHidden == false && alpha > 0 }
+    internal final var shouldRender: Bool { return isHidden == false && alpha > 0 }
 
 
 
     // MARK: - Drawing
 
     open func draw(_ rect: CGRect) { /* implemented by subclasses */ }
 
-    internal final func render(in renderer) {
+    internal final func render(in renderer: Renderer) {
 
-        let shouldDrawContent = hidden == false && alpha > 0
+        guard shouldRender
+            else { return }
 
 
     }
@@ -450,7 +451,7 @@ open class UIView {
         UIGraphicsPushContext(CGContext(context))
 
         // draw background color
-        context.fillColor = backgroundColor.CGColor
+        context.fillColor = backgroundColor?.cgColor
         context.add(rect: bounds)
         try! context.fill()
 

Sources/Cacao/UIViewContentMode.swift

@@ -6,6 +6,12 @@
 //  Copyright © 2016 PureSwift. All rights reserved.
 //
 
+#if os(macOS)
+    import Darwin.C.math
+#elseif os(Linux)
+    import Glibc
+#endif
+
 import Silica
 
 public enum UIViewContentMode: Int {

Sources/Cacao/UIViewController.swift

@@ -5,9 +5,166 @@
 //  Created by Alsey Coleman Miller on 6/7/17.
 //
 
+import class Foundation.NSCoder
+import class Foundation.Bundle
 import Silica
 
 open class UIViewController {
 
+    // MARK: - Configuring a View Controller Using Nib Files
+
+    public init?(coder: NSCoder) {
+
+        return nil
+    }
+
+    /// Returns a newly initialized view controller with the nib file in the specified bundle.
+    public init(nibName: String? = nil, bundle: Bundle? = nil) {
+
+        self.nibName = nibName
+        self.nibBundle = bundle
+    }
+
+    public final var nibName: String?
+
+    public final var nibBundle: Bundle?
+
+    // MARK: - Managing the View
+
+    /// The view that the controller manages.
+    ///
+    /// The view stored in this property represents the root view for the view controller'€™s view hierarchy.
+    /// The default value of this property is nil.
+    ///
+    /// If you access this property and its value is currently nil,
+    /// the view controller automatically calls the loadView() method and returns the resulting view.
+    ///
+    /// Each view controller object is the sole owner of its view.
+    /// You must not associate the same view object with multiple view controller objects.
+    /// The only exception to this rule is that a container view controller implementation may
+    /// add this view as a subview in its own view hierarchy. Before adding the subview,
+    /// the container must first call its `addChildViewController(_:)` method
+    /// to create a parent-child relationship between the two view controller objects.
+    ///
+    /// Because accessing this property can cause the view to be loaded automatically,
+    /// you can use the isViewLoaded() method to determine if the view is currently in memory.
+    /// Unlike this property, the isViewLoaded() property does not force the loading of the
+    /// view if it is not currently in memory.
+    public final var view: UIView! {
+        get { loadViewIfNeeded(); return _view }
+        set { _view = newValue }
+    }
+    private var _view: UIView?
+    public final var isViewLoaded: Bool { return _view != nil }
+
+    /// You should never call this method directly.
+    /// The view controller calls this method when its view property is requested but is currently nil.
+    /// This method loads or creates a view and assigns it to the view property.
+    ///
+    /// If the view controller has an associated nib file, this method loads the view from the nib file.
+    /// A view controller has an associated nib file if the nibName property returns a non-nil value,
+    /// which occurs if the view controller was instantiated from a storyboard,
+    /// if you explicitly assigned it a nib file using the `init(nibName:bundle:)` method,
+    /// or if the app finds a nib file in the app bundle with a name based on the view controller'€™s class name.
+    /// If the view controller does not have an associated nib file, this method creates a plain `UIView` object instead.
+    ///
+    /// If you use Interface Builder to create your views and initialize the view controller, you must not override this method.
+    ///
+    /// You can override this method in order to create your views manually.
+    /// If you choose to do so, assign the root view of your view hierarchy to the view property.
+    /// The views you create should be unique instances and should not be shared with any other view controller object.
+    /// Your custom implementation of this method should not call super.
+    ///
+    /// If you want to perform any additional initialization of your views, do so in the `viewDidLoad()` method.
+    open func loadView() {
+
+        self.view = UIView(frame: CGRect())
+    }
+
+    /// Called after the controller'€™s view is loaded into memory.
+    open func viewDidLoad() { /* Subclasses should override */ }
+
+    /// Loads the view controller’s view if it has not yet been loaded.
+    public final func loadViewIfNeeded() {
+
+        if isViewLoaded == false {
+            loadView()
+            viewDidLoad()
+        }
+    }
+
+    /// The view controller’s view, or nil if the view is not yet loaded.
+    public final var viewIfLoaded: UIView? { return _view }
+
+    /// A localized string that represents the view this controller manages.
+    public final var title: String?
+
+    /// The preferred size for the view controller’s view.
+    ///
+    /// The value in this property is used primarily when displaying the view controller’s
+    /// content in a popover but may also be used in other situations.
+    public final var preferredContentSize: CGSize = CGSize()
+
+    // MARK: - Presenting View Controllers
+
+    // MARK: - Responding to View Events
+
+    // MARK: - Configuring the View’s Layout Behavior
+
+    // MARK: - Configuring the View Rotation Settings
+
+    // MARK: - Managing Child View Controllers in a Custom Container
+
+    public final private(set) var childViewControllers = [UIViewController]()
+
+    public final func addChildViewController(_ viewController: UIViewController) {
+
+        childViewControllers.append(viewController)
+
+        viewController.parent = self
+    }
+
+    public final func removeFromParentViewController() {
+
+        guard let index = parent?.childViewControllers.index(where: { $0 === self })
+            else { return }
+
+        parent?.childViewControllers.remove(at: index)
+    }
+
+    // MARK: - Responding to Containment Events
+
+    // MARK: - Getting Other Related View Controllers
+
+    /// The view controller that presented this view controller.
+    public private(set) weak var presentingViewController: UIViewController?
+
+    /// The view controller that is presented by this view controller, or one of its ancestors in the view controller hierarchy.
+    public var presentedViewController: UIViewController? {
+
+        return nil
+    }
+
+    public final private(set) weak var parent: UIViewController?
+
+    //public final var navigationController: UINavigationController?
+
+    //var splitViewController: UISplitViewController?
+    //var tabBarController: UITabBarController?
+
+    // MARK: - Handling Memory Warnings
+
+    /// Sent to the view controller when the app receives a memory warning.
+    ///
+    /// Your app never calls this method directly.
+    /// Instead, this method is called when the system determines that the amount of available memory is low.
+    ///
+    /// You can override this method to release any additional memory used by your view controller.
+    /// If you do, your implementation of this method must call the super implementation at some point.
+    open func didReceiveMemoryWarning() {
+
+        childViewControllers.forEach { $0.didReceiveMemoryWarning() }
+    }
+
 
 }