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

Added adjustable registration point to Widget #121

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Added adjustable registration point to Widget #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
310813c
Added adjustable registration point to Widget
Caligari Mar 3, 2014
6b33361
Allow registration of already registered class
Caligari Mar 24, 2014
be9f25f
Merge branch 'master' of https://github.com/RealyUniqueName/StablexUI
Caligari May 8, 2014
b6a9108
Speculative changes for rotation around center and update on resize
Caligari Jun 12, 2014
50359cb
Fixes to rotation - now using rot
Caligari Jun 16, 2014
8cd7e06
Changed rot to rotate
Caligari Jun 16, 2014
38c3036
Fixed finally
Caligari Jun 16, 2014
b453668
correct position for registration
Caligari Jun 17, 2014
3606756
Added scale to registration calculations
Caligari Jun 18, 2014
dde5b7d
Box children alignment takes into account rotation
Caligari Jun 20, 2014
5eb02b9
added relative x, y, and rotation
Caligari Jun 25, 2014
c484ac5
Need to be able to override set_src
Caligari Aug 13, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/ru/stablex/ui/UIBuilder.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,9 +605,9 @@ class UIBuilder {
}

if( cls != null ){
if( UIBuilder._imports.exists(cls) ) Err.trigger('Class is already imported: ' + cls);
UIBuilder._imports.set(cls, fullyQualifiedName);

if( !UIBuilder._imports.exists(cls) ){ // Err.trigger('Class is already imported: ' + cls);
UIBuilder._imports.set(cls, fullyQualifiedName);
}
}else{
Err.trigger('Wrong class name: ' + fullyQualifiedName);
}
Expand Down
2 changes: 1 addition & 1 deletion src/ru/stablex/ui/widgets/Bmp.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ class Bmp extends Widget{
* Setter src
*
*/
private inline function set_src(src:String) : String {
private function set_src(src:String) : String {
if( src != null ){
this._bitmapData = null;
}
Expand Down
35 changes: 26 additions & 9 deletions src/ru/stablex/ui/widgets/Box.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ class Box extends Widget{
* get object width
*
*/
@:noCompletion static private inline function _objWidth (obj:DisplayObject) : Float {
@:noCompletion static private function _objWidth (obj:DisplayObject, ignoreRot:Bool=false) : Float {
// #if html5
if( Std.is(obj, Widget) ){
return cast(obj, Widget).w;
return cast(obj, Widget).get_rotated_w() * cast(obj, Widget).scaleX;
}else if( Std.is(obj, flash.text.TextField) ){
return cast(obj, flash.text.TextField).textWidth + 4;
}else{
Expand All @@ -76,10 +76,10 @@ class Box extends Widget{
* get object height
*
*/
@:noCompletion static private inline function _objHeight (obj:DisplayObject) : Float {
@:noCompletion static private function _objHeight (obj:DisplayObject, ignoreRot:Bool=false) : Float {
// #if html5
if( Std.is(obj, Widget) ){
return cast(obj, Widget).h;
return cast(obj, Widget).get_rotated_h() * cast(obj, Widget).scaleY;
}else if( Std.is(obj, flash.text.TextField) ){
return cast(obj, flash.text.TextField).textHeight + 4;
}else{
Expand Down Expand Up @@ -126,29 +126,38 @@ class Box extends Widget{
*******************************************************************************/


override public function onCreate() : Void {
super.onCreate();
//trace("onCreate Box - " + name);
alignElements();
}

/**
* Refresh widgets. Re-apply skin box and realigns children
*
*/
override public function refresh() : Void {
//trace("Box starting refresh - " + name);
if( this.autoWidth || this.autoHeight ){
var w : Float = (this.autoWidth ? this._calcWidth() : this._width);
var h : Float = (this.autoHeight ? this._calcHeight() : this._height);

if( this._width != w || this._height != h ){

this._width = w;
this._height = h;

this.dispatchEvent(new WidgetEvent(WidgetEvent.RESIZE));
_onResize();
//this.dispatchEvent(new WidgetEvent(WidgetEvent.RESIZE));
}
}//if( autoSize )

super.refresh();

if( this.layout == null ){
if ( this.layout == null ) {
//trace(" Box align in refresh");
this.alignElements();
}
//trace("Box ending refresh");
}//function refresh()


Expand All @@ -165,7 +174,6 @@ class Box extends Widget{
var childW : Float = 0;

for(i in 0...this.numChildren){
child = this.getChildAt(i);
child = this.getChildAt(i);
if( child.visible ){
childW = Box._objWidth(child);
Expand Down Expand Up @@ -244,6 +252,7 @@ class Box extends Widget{
*
*/
public function alignElements () : Void {
//trace(" in align - " + name);
if( this.unifyChildren ){
this._unifyChildren();
}
Expand Down Expand Up @@ -317,6 +326,7 @@ class Box extends Widget{
*
*/
@:noCompletion private function _vAlignTop () : Void {
//trace(" align top - " + name);
//vertical box
if( this.vertical ){
var lastY : Float = this.paddingTop;
Expand All @@ -343,6 +353,7 @@ class Box extends Widget{
*
*/
@:noCompletion private function _vAlignMiddle () : Void {
//trace(" align middle - " + name);
//vertical box
if(this.vertical){
//count sum children height
Expand Down Expand Up @@ -386,6 +397,7 @@ class Box extends Widget{
*
*/
@:noCompletion private function _vAlignBottom () : Void {
//trace(" align bottom - " + name);
//vertical box
if( this.vertical ){
var lastY : Float = this.h - this.paddingBottom;
Expand Down Expand Up @@ -414,6 +426,7 @@ class Box extends Widget{
*
*/
@:noCompletion private function _hAlignLeft () : Void {
//trace(" align left - " + name);
//vertical box
if(this.vertical){
for(i in 0...this.numChildren){
Expand All @@ -440,6 +453,7 @@ class Box extends Widget{
*
*/
@:noCompletion private function _hAlignRight () : Void {
//trace(" align right - " + name);
//vertical box
if(this.vertical){
var child : DisplayObject;
Expand Down Expand Up @@ -468,6 +482,7 @@ class Box extends Widget{
*
*/
@:noCompletion private function _hAlignCenter () : Void {
//trace(" align center - " + name);
//vertical box
if(this.vertical){
var child : DisplayObject;
Expand Down Expand Up @@ -567,6 +582,7 @@ class Box extends Widget{
*
*/
@:noCompletion private function _onChildResize (e:WidgetEvent = null) : Void {
//trace("resized child of " + name);
if( this.created ){
if( this.autoWidth || this.autoHeight ){
if( e != null ){
Expand All @@ -575,7 +591,8 @@ class Box extends Widget{
child != null && child.visible != false
&& !(this.autoWidth && child._widthUsePercent)
&& !(this.autoHeight && child._heightUsePercent)
){
) {
//trace(" child is " + child.name);
this.refresh();
}
}else{
Expand Down
Loading