Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Merge Positioning Changes #51

Merged
merged 17 commits into from

2 participants

@nsxdavid

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

FrittenKeeZ and others added some commits
@FrittenKeeZ FrittenKeeZ Offset should not be subtracted from screen height/width, it is actua…
…lly accounted for in the positioning.
07494ee
@FrittenKeeZ FrittenKeeZ UITextInstance now properly works with the revamped positioning system. eef917f
@FrittenKeeZ FrittenKeeZ Why didn't this get committed before? b99e208
@FrittenKeeZ FrittenKeeZ 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.
c3ba818
@FrittenKeeZ FrittenKeeZ Corrected failing demo scene scripts.
Added divide by zero prevention as UIObject now has protected width and height values, which inherited members use.
524c7fc
@FrittenKeeZ FrittenKeeZ Fixed glyph removal as mentioned by David d609a02
@FrittenKeeZ FrittenKeeZ Better handling for transformChanged event propagation.
Removed unnecessary transform properties from UITouchableSprite as it is handled by inheritance.
6192896
@FrittenKeeZ FrittenKeeZ Updated UIAbstractContainer to use UIAnchorInfo to position children. 7ab99bd
@FrittenKeeZ FrittenKeeZ Ensure the sprite's depth is kept. 0fa4733
@FrittenKeeZ FrittenKeeZ Hidden sprites won't affect the layout in UIAbstractContainer. It now…
… also listens for its own transformChanged to update layout.
1c3e8b7
@FrittenKeeZ FrittenKeeZ Corrected depth of UITextInstance glyphs so the depth is properly con…
…trolled by UITextInstance.
3ec02da
@FrittenKeeZ FrittenKeeZ Made UIAnimation base time changes on realTimeSinceStartup instead of…
… time to enable animation while timeScale = 0.
c139540
@FrittenKeeZ FrittenKeeZ Make sure the UITextInstance glyphs are hidden if the UITextInstance is. f199e38
@nsxdavid nsxdavid Updated ignore files for new visual studio 44d278b
@nsxdavid nsxdavid Merge branch 'Positioning' of https://github.com/FrittenKeeZ/UIToolkit
…into Positioning

Conflicts:
	Assets/Plugins/UIToolkit/BaseElements/UIObject.cs
	Assets/Plugins/UIToolkit/Support/IPositionablePositioningExtensions.cs
b0b39a3
@FrittenKeeZ

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

@nsxdavid

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

@nsxdavid

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

@nsxdavid nsxdavid merged commit 2bb6857 into master
@oddgames-david oddgames-david deleted the Positioning branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Nov 28, 2011
  1. @FrittenKeeZ

    Offset should not be subtracted from screen height/width, it is actua…

    FrittenKeeZ authored
    …lly accounted for in the positioning.
Commits on Nov 30, 2011
  1. @FrittenKeeZ
  2. @FrittenKeeZ
  3. @FrittenKeeZ

    Relative positioning is now based on parent's width and height.

    FrittenKeeZ authored
    If an UIObject is manually moved (through position or localPosition) the anchor information can be refreshed using refreshAnchorInformation extension.
  4. @FrittenKeeZ

    Corrected failing demo scene scripts.

    FrittenKeeZ authored
    Added divide by zero prevention as UIObject now has protected width and height values, which inherited members use.
Commits on Dec 1, 2011
  1. @FrittenKeeZ
  2. @FrittenKeeZ

    Better handling for transformChanged event propagation.

    FrittenKeeZ authored
    Removed unnecessary transform properties from UITouchableSprite as it is handled by inheritance.
  3. @FrittenKeeZ
  4. @FrittenKeeZ
  5. @FrittenKeeZ

    Hidden sprites won't affect the layout in UIAbstractContainer. It now…

    FrittenKeeZ authored
    … also listens for its own transformChanged to update layout.
Commits on Dec 2, 2011
  1. @FrittenKeeZ
  2. @FrittenKeeZ

    Made UIAnimation base time changes on realTimeSinceStartup instead of…

    FrittenKeeZ authored
    … time to enable animation while timeScale = 0.
  3. @FrittenKeeZ
Commits on Dec 4, 2011
  1. @nsxdavid
  2. @nsxdavid

    Merge branch 'Positioning' of https://github.com/FrittenKeeZ/UIToolkit

    nsxdavid authored
    …into Positioning
    
    Conflicts:
    	Assets/Plugins/UIToolkit/BaseElements/UIObject.cs
    	Assets/Plugins/UIToolkit/Support/IPositionablePositioningExtensions.cs
  3. @nsxdavid
  4. @nsxdavid
Something went wrong with that request. Please try again.