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.

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

Fix layout of the "Defer" date picker view #249

Merged
merged 5 commits into from
Sep 7, 2021
Merged

Fix layout of the "Defer" date picker view #249

merged 5 commits into from
Sep 7, 2021

Conversation

bartreardon
Copy link
Contributor

Part 2 of fixing the issues raised in #246

A little more work but brings the view declaration into line with how other views are defined with stronger reliance on letting SwiftUI do the layout for the most part

Before:
defer-before

After:
Screen Shot 2021-09-07 at 5 06 27 pm

…e image. Also support optional parameters to return an image of certain size.
…e for the image. Also support optional parameters to return an image of certain size."

This reverts commit 7a7f860.
Remove all unnecessary frame width declarations.
added padding 4 to close button to visually seperate it from the view edges
added vstack for date pickers with padding addeed to match the look and feel to be as close as possible to the previous version
removed button hstack as it wasn't needed (stack of one item)
@bartreardon
Copy link
Contributor Author

tested on macOS 11 and 12

@erikng erikng merged commit bd2425c into macadmins:development Sep 7, 2021
@erikng
Copy link
Member

erikng commented Sep 7, 2021

I had planned on fixing this but yay, now I don't have to. Thanks buddy! :)

@bartreardon
Copy link
Contributor Author

ha - well was in the mood for it (and I might have ddid it in the last PR if I wasn't running a headache and realised where the change was needed)....anyway- pity that http image branch won't go away for whatever reason - revert, rebase, unmerge, exorcise, pull.....this is why people nuke and re-clone. :/

@erikng
Copy link
Member

erikng commented Sep 7, 2021

That's why I squashed this PR into a single commit. What I would suggest is destroying your development branch and then creating a new branch from my origin development branch. Should fix you up moving forward.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants