Skip to content
This repository was archived by the owner on Mar 14, 2020. It is now read-only.

Integration 20120827#255

Closed
zhizhangchen wants to merge 46 commits into
intel:masterfrom
zhizhangchen:integration-20120827
Closed

Integration 20120827#255
zhizhangchen wants to merge 46 commits into
intel:masterfrom
zhizhangchen:integration-20120827

Conversation

@zhizhangchen

Copy link
Copy Markdown
Contributor

#252, #250, #249, #248, #232, #243, #254, #196, #222 included

There are some conflicts between #196 and the button group PR, and some conflicts between #222 and the other PR. I fixed them in the merge commits

Xuqing Kuang and others added 30 commits August 24, 2012 14:57
For force generate ID property for event handler.
Completed:
1. Event handler dialog construct
2. JS code exporting.
3. JS Preview.
Introduced ControlGroup as base widget for ButtonGroup, RadioGroup
and CheckboxGroup, then base horizontal and vertical ButtonGroup
on ButtonGroup
We can define a "morph" function for a zone so that When adding
a child, it can be morphed to another type. With this feature, we
can have a generic widget in the palette which can adapt
to different types of containers when dropped on them.
Looking for parent zone with the same name. If found, extend it
with descendant zone, otherwize add a new zone.
zhizhangchen and others added 16 commits August 28, 2012 01:11
Also set the default value of count bubble to empty, i.e, no count
bubble
Sorting is still OK without this change and it causes bad
appearance of ButtonGroup and ThumbnailSplitList
Previous algorithm only supports one zone containers or Headers,
and it works hard to determine the position for insertion. The new
algorithm firstly tries to insert to the zone of the nearest
sibling using enhenced insertChildAfter/Before, if fails, uses
addChild to automatically find a zone to insert.
…20120827

Conflicts:
	src/js/views/property.js
@zhizhangchen

Copy link
Copy Markdown
Contributor Author

Replaced by #263

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants