fixed horizontal lyout alignment issue#1 (Ezelia#1)

shalevy1 · May 4, 2015 · 0ba1441 · 0ba1441
1 parent c36c4dc
commit 0ba1441
Show file tree

Hide file tree

Showing 6 changed files with 1,413 additions and 1,350 deletions.
diff --git a/EZGUI.csproj b/EZGUI.csproj
@@ -72,13 +72,17 @@
     <Content Include="assets\metalworks-theme\images\corner.png" />
     <Content Include="assets\metalworks-theme\images\line.png" />
     <Content Include="dist\EZGUI.js" />
+    <Content Include="examples\01-window\6-layout-relative-positions.html" />
     <Content Include="examples\01-window\5-children-programmatically.html" />
     <Content Include="examples\01-window\4-layout.html" />
     <Content Include="examples\01-window\3-header.html" />
     <Content Include="examples\01-window\2-children.html" />
     <Content Include="examples\01-window\1-simple.html" />
     <Content Include="examples\02-button\1-simple.html" />
     <Content Include="examples\02-button\2-skin.html" />
+    <Content Include="examples\05-slider\1-horizontal.html" />
+    <Content Include="examples\04-radio\1-list.html" />
+    <Content Include="examples\03-checkbox\1-list.html" />
     <Content Include="examples\app\phaser.html" />
     <Content Include="examples\fonts\01.html" />
     <Content Include="examples\app\app-gui.js" />
@@ -133,6 +137,7 @@
   <ItemGroup>
     <Content Include="assets\fonts\Skranji-Bold-40.fnt" />
   </ItemGroup>
+  <ItemGroup />
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">12.0</VisualStudioVersion>
   </PropertyGroup>

diff --git a/dist/EZGUI.d.ts b/dist/EZGUI.d.ts
@@ -1,20 +1,4 @@
-/// <reference path="../lib/PIXI.d.ts" />
-declare module EZGUI.Compatibility {
-    var PIXIVersion: number;
-    var isPhaser: boolean;
-    var BitmapText: any;
-    class TilingSprite {
-        constructor(texture: PIXI.Texture, width: number, height: number);
-    }
-    class GUIContainer extends PIXI.DisplayObjectContainer {
-    }
-    class GUIDisplayObjectContainer extends GUIContainer {
-        protected phaserGroup: any;
-        _listeners: any;
-        constructor();
-    }
-    function createRenderTexture(width: any, height: any): any;
-}
+/// <reference path="../lib/pixi.d.ts" />
 declare module EZGUI {
     var Easing: {
         Linear: {
@@ -136,23 +120,21 @@ declare module EZGUI {
         update(time: any): boolean;
     }
 }
-declare module EZGUI {
-    var VERSION: string;
-    var tilingRenderer: any;
-    var dragging: any;
-    var dsx: number;
-    var dsy: number;
-    var startDrag: {
-        x: any;
-        y: any;
-        t: any;
-    };
-    var game: any;
-    var themes: {};
-    var components: {};
-    var radioGroups: any;
-    function registerComponents(cpt: any, id?: any): void;
-    function create(settings: any, theme: any): any;
+declare module EZGUI.Compatibility {
+    var PIXIVersion: number;
+    var isPhaser: boolean;
+    var BitmapText: any;
+    class TilingSprite {
+        constructor(texture: PIXI.Texture, width: number, height: number);
+    }
+    class GUIContainer extends PIXI.DisplayObjectContainer {
+    }
+    class GUIDisplayObjectContainer extends GUIContainer {
+        protected phaserGroup: any;
+        _listeners: any;
+        constructor();
+    }
+    function createRenderTexture(width: any, height: any): any;
 }
 declare var Phaser: any;
 declare module EZGUI {
@@ -184,6 +166,24 @@ declare module EZGUI {
         applySkin(settings: any): any;
     }
 }
+declare module EZGUI {
+    var VERSION: string;
+    var tilingRenderer: any;
+    var dragging: any;
+    var dsx: number;
+    var dsy: number;
+    var startDrag: {
+        x: any;
+        y: any;
+        t: any;
+    };
+    var game: any;
+    var themes: {};
+    var components: {};
+    var radioGroups: any;
+    function registerComponents(cpt: any, id?: any): void;
+    function create(settings: any, theme: any): any;
+}
 declare module EZGUI {
     class MultistateSprite extends PIXI.Sprite {
         stateTextures: any;
@@ -257,65 +257,65 @@ declare module EZGUI {
     }
 }
 declare module EZGUI.Component {
-    class Button extends GUISprite {
+    class Label extends GUISprite {
         _settings: any;
         themeId: any;
         constructor(_settings: any, themeId: any);
+        protected setupEvents(): void;
         protected handleEvents(): void;
+        protected draw(): void;
     }
 }
 declare module EZGUI.Component {
-    class Checkbox extends Button {
+    class Slider extends GUISprite {
         _settings: any;
         themeId: any;
-        protected _checked: boolean;
-        protected _checkmark: any;
-        checked: boolean;
-        text: string;
+        value: number;
+        private slide;
+        private horizontalSlide;
         constructor(_settings: any, themeId: any);
+        protected setupEvents(): void;
+        protected drawText(): void;
         protected handleEvents(): void;
         protected draw(): void;
-        protected drawText(): void;
     }
 }
+declare module EZGUI.utils.ColorParser {
+    function parseToPixiColor(str: any): any;
+    function parseToRGB(str: any): any;
+}
 declare module EZGUI.Component {
-    class Label extends GUISprite {
+    class Button extends GUISprite {
         _settings: any;
         themeId: any;
         constructor(_settings: any, themeId: any);
-        protected setupEvents(): void;
         protected handleEvents(): void;
-        protected draw(): void;
     }
 }
 declare module EZGUI.Component {
-    class Layout extends GUISprite {
+    class Checkbox extends Button {
         _settings: any;
         themeId: any;
-        guiMask: any;
+        protected _checked: boolean;
+        protected _checkmark: any;
+        checked: boolean;
+        text: string;
         constructor(_settings: any, themeId: any);
         protected handleEvents(): void;
         protected draw(): void;
-        createChild(childSettings: any, order?: any): any;
-        addChildAt(child: any, index: any): PIXI.DisplayObject;
+        protected drawText(): void;
     }
 }
 declare module EZGUI.Component {
-    class List extends Layout {
+    class Layout extends GUISprite {
         _settings: any;
         themeId: any;
-        private decelerationItv;
-        private decelerationSpeed;
-        private tween;
-        private slotSize;
-        private horizontalSlide;
+        guiMask: any;
         constructor(_settings: any, themeId: any);
         protected handleEvents(): void;
-        private decelerateScroll(endPos);
+        protected draw(): void;
+        createChild(childSettings: any, order?: any): any;
         addChildAt(child: any, index: any): PIXI.DisplayObject;
-        removeChild(child: any): PIXI.DisplayObject;
-        slideBy(value: any, delay?: any): void;
-        slideTo(value: any, delay?: any): void;
     }
 }
 declare module EZGUI.Component {
@@ -332,17 +332,21 @@ declare module EZGUI.Component {
     }
 }
 declare module EZGUI.Component {
-    class Slider extends GUISprite {
+    class List extends Layout {
         _settings: any;
         themeId: any;
-        value: number;
-        private slide;
+        private decelerationItv;
+        private decelerationSpeed;
+        private tween;
+        private slotSize;
         private horizontalSlide;
         constructor(_settings: any, themeId: any);
-        protected setupEvents(): void;
-        protected drawText(): void;
         protected handleEvents(): void;
-        protected draw(): void;
+        private decelerateScroll(endPos);
+        addChildAt(child: any, index: any): PIXI.DisplayObject;
+        removeChild(child: any): PIXI.DisplayObject;
+        slideBy(value: any, delay?: any): void;
+        slideTo(value: any, delay?: any): void;
     }
 }
 declare module EZGUI.Component {
@@ -365,10 +369,6 @@ declare module EZGUI {
         setState(state?: string): void;
     }
 }
-declare module EZGUI.utils.ColorParser {
-    function parseToPixiColor(str: any): any;
-    function parseToRGB(str: any): any;
-}
 declare module EZGUI.utils {
     /**
      * check if the the point defined by x and y outside a visible gui element