Skip to content
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

Jump to bottom

WIP: Experiments and hacks attempting to implement SwiftUI-like layout flow #379

Draft
wants to merge 25 commits into
base: main
Choose a base branch
from
Draft

WIP: Experiments and hacks attempting to implement SwiftUI-like layout flow #379

wants to merge 25 commits into from

Commits on Feb 13, 2021

  1. WIP: Experiments and hacks attempting to implement SwiftUI-like layou… 

    …t flow
    @mortenbekditlevsen
    mortenbekditlevsen committed Feb 13, 2021
    Configuration menu
    Copy the full SHA
    f07c9f1 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2021

  1. Working on Overlay but I think the layout functionality needs to go i… 

    …nto TokamakCore to make everything fit nicely together. Use CGPoint instead of CGAffineTransform for context since the latter has issues in .concatenate. Will create a separate PR to fix that.
    @mortenbekditlevsen
    mortenbekditlevsen committed Feb 17, 2021
    Configuration menu
    Copy the full SHA
    c6e8ca5 View commit details
    Browse the repository at this point in the history

  2. Let top of stack be an actual var

    @mortenbekditlevsen
    mortenbekditlevsen committed Feb 17, 2021
    Configuration menu
    Copy the full SHA
    b704e4b View commit details
    Browse the repository at this point in the history

  3. Made properties of CGPoint, CGSize and CGRect vars instead of lets. I… 

    …nitialized array used by CGAffineTransform concatenation
    @mortenbekditlevsen
    mortenbekditlevsen committed Feb 17, 2021
    Configuration menu
    Copy the full SHA
    a3d5c8d View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2021

  1. Merge branch 'main' of https://github.com/TokamakUI/Tokamak into main

    @mortenbekditlevsen
    mortenbekditlevsen committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    0cf7cab View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into gtk-swiftui-layout

    @mortenbekditlevsen
    mortenbekditlevsen committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    c2a8501 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2021

  1. Moved parts - but not yet enough - of the functionality to Core. Made… 

    … Overlay work
    @mortenbekditlevsen
    mortenbekditlevsen committed Feb 19, 2021
    Configuration menu
    Copy the full SHA
    0304778 View commit details
    Browse the repository at this point in the history

  2. Rename element to hostView

    @mortenbekditlevsen
    mortenbekditlevsen committed Feb 19, 2021
    Configuration menu
    Copy the full SHA
    940f42b View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2021

  1. Move Overlay, HStack and VStack layout code to core. Currently using … 

    …a bit of an annoying protocol conformance to Target
    @mortenbekditlevsen
    mortenbekditlevsen committed Feb 22, 2021
    Configuration menu
    Copy the full SHA
    eea393a View commit details
    Browse the repository at this point in the history

  2. Remove 'expand' property of AnyWidget since it's never actually being… 

    … used
    @mortenbekditlevsen
    mortenbekditlevsen committed Feb 22, 2021
    Configuration menu
    Copy the full SHA
    74b8a37 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2021

  1. Add HStack implementation from objc.io SwiftTalk episode 232. Rename … 

    …this logic to StackHelper to keep it separate and to reuse between HStack and VStack
    @mortenbekditlevsen
    mortenbekditlevsen committed Feb 24, 2021
    Configuration menu
    Copy the full SHA
    d0b54de View commit details
    Browse the repository at this point in the history

  2. Make StackHelper into a class in order to prepare it to carry a sligh… 

    …t bit of mutable state
    @mortenbekditlevsen
    mortenbekditlevsen committed Feb 24, 2021
    Configuration menu
    Copy the full SHA
    75c7cb3 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2021

  1. Layout for ViewModifiers

    @mortenbekditlevsen
    mortenbekditlevsen committed Feb 25, 2021
    Configuration menu
    Copy the full SHA
    efd15a6 View commit details
    Browse the repository at this point in the history

  2. Remove special casing as layout system now handles it

    @mortenbekditlevsen
    mortenbekditlevsen committed Feb 25, 2021
    Configuration menu
    Copy the full SHA
    4545549 View commit details
    Browse the repository at this point in the history

  3. Background modifier

    @mortenbekditlevsen
    mortenbekditlevsen committed Feb 25, 2021
    Configuration menu
    Copy the full SHA
    08930a2 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2021

  1. Add Alignment. Add ZStack

    @mortenbekditlevsen
    mortenbekditlevsen committed Feb 26, 2021
    Configuration menu
    Copy the full SHA
    44efe77 View commit details
    Browse the repository at this point in the history

  2. Fix size calculation

    @mortenbekditlevsen
    mortenbekditlevsen committed Feb 26, 2021
    Configuration menu
    Copy the full SHA
    ea4f846 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2021

  1. Merge branch 'main' into gtk-swiftui-layout

    @j-f1
    j-f1 committed May 4, 2021
    Configuration menu
    Copy the full SHA
    0188e20 View commit details
    Browse the repository at this point in the history

  2. Remove legacy alignments

    @j-f1
    j-f1 committed May 4, 2021
    Configuration menu
    Copy the full SHA
    61224b5 View commit details
    Browse the repository at this point in the history

  3. Fix misc lint issues

    @j-f1
    j-f1 committed May 4, 2021
    Configuration menu
    Copy the full SHA
    6657c1a View commit details
    Browse the repository at this point in the history

  4. Stop using legacy JSClosure initialization

    @j-f1
    j-f1 committed May 4, 2021
    Configuration menu
    Copy the full SHA
    c1555ca View commit details
    Browse the repository at this point in the history

  5. fix non-exhaustive cases

    @j-f1
    j-f1 committed May 4, 2021
    Configuration menu
    Copy the full SHA
    3a7fbd9 View commit details
    Browse the repository at this point in the history

  6. Implement static and test rendering contexts

    @j-f1
    j-f1 committed May 4, 2021
    Configuration menu
    Copy the full SHA
    0fd7dc0 View commit details
    Browse the repository at this point in the history

  7. Update Package.resolved

    @j-f1
    j-f1 committed May 4, 2021
    Configuration menu
    Copy the full SHA
    44a3f9e View commit details
    Browse the repository at this point in the history

Commits on May 7, 2021

  1. Add safeguards for PrimitiveViews that do not conform to BuiltinView

    @mortenbekditlevsen
    mortenbekditlevsen committed May 7, 2021
    Configuration menu
    Copy the full SHA
    3026741 View commit details
    Browse the repository at this point in the history