Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Merge Positioning Changes #51

Merged
merged 17 commits into from Dec 4, 2011

Conversation

Projects
None yet
2 participants
Contributor

nsxdavid commented Dec 4, 2011

This is a clean version of FrittenKeeZ's Positioning branch for merging into master

FrittenKeeZ and others added some commits Nov 28, 2011

Relative positioning is now based on parent's width and height.
If an UIObject is manually moved (through position or localPosition) the anchor information can be refreshed using refreshAnchorInformation extension.
Corrected failing demo scene scripts.
Added divide by zero prevention as UIObject now has protected width and height values, which inherited members use.
Better handling for transformChanged event propagation.
Removed unnecessary transform properties from UITouchableSprite as it is handled by inheritance.
Hidden sprites won't affect the layout in UIAbstractContainer. It now…
… also listens for its own transformChanged to update layout.
Made UIAnimation base time changes on realTimeSinceStartup instead of…
… time to enable animation while timeScale = 0.
Merge branch 'Positioning' of https://github.com/FrittenKeeZ/UIToolkit
…into Positioning

Conflicts:
	Assets/Plugins/UIToolkit/BaseElements/UIObject.cs
	Assets/Plugins/UIToolkit/Support/IPositionablePositioningExtensions.cs
Contributor

FrittenKeeZ commented Dec 4, 2011

I wonder why changes to UIObject can't be seen?

Contributor

nsxdavid commented Dec 4, 2011

That is odd... it thinks its binary for some reason. I will investigate before merging.

Contributor

nsxdavid commented Dec 4, 2011

Titantic struggle to get UIObject.cs to not be considered a binary file. But got it.

nsxdavid added a commit that referenced this pull request Dec 4, 2011

@nsxdavid nsxdavid merged commit 2bb6857 into master Dec 4, 2011

@oddgames-david oddgames-david deleted the Positioning branch Mar 11, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment