for fgui v1.1.2

jcyuan · Dec 1, 2017 · 21d1227 · 21d1227
1 parent f96985e
commit 21d1227
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 22 deletions.
diff --git a/gui/.objs/workspace.json b/gui/.objs/workspace.json
@@ -1,21 +1,15 @@
 {
-	"docs": [
-		"x8x40spb",
-		"idqru",
-		"x8x40spb",
-		"hxib41",
-		"x8x40spb",
-		"idqr10",
+	"expanded_nodes": [
 		"x8x40spb",
-		"ntk66t"
+		"/"
 	],
-	"hidden_packages": [],
 	"active_doc": [
 		"x8x40spb",
 		"idqru"
 	],
-	"expanded_nodes": [
+	"docs": [
 		"x8x40spb",
-		"/"
-	]
+		"idqru"
+	],
+	"hidden_packages": []
 }
diff --git a/gui/settings/Publish.json b/gui/settings/Publish.json
@@ -10,5 +10,5 @@
 	},
 	"fileExtension":"jpg",
 	"packageCount":2,
-	"path":"G:\\projects\\laboratory\\FairyGUI-PixiJS-Example\\proj\\dist\\images"
+	"path":"../proj/dist/images"
 }
diff --git a/proj/dist/js/Main.js b/proj/dist/js/Main.js
diff --git a/proj/dist/js/Main.js.map b/proj/dist/js/Main.js.map
diff --git a/proj/src/Main.ts b/proj/src/Main.ts
@@ -37,8 +37,8 @@ class Main extends PIXI.Application {
         fgui.GRoot.inst.addChild(this.contentlayer);
 
         this.contentlayer.addChild(this.loadingView = new LoadingView());
-        this.loadingView.addRelation(fgui.GRoot.inst, fgui.RelationType.Size);
         this.loadingView.setSize(fgui.GRoot.inst.width, fgui.GRoot.inst.height);
+        this.loadingView.addRelation(fgui.GRoot.inst, fgui.RelationType.Size);
 
         //test.jpg actually is a binary file but just ends with fake postfix.
         let loader = new fgui.utils.AssetLoader();
@@ -58,7 +58,7 @@ class Main extends PIXI.Application {
     private loadProgress(loader: PIXI.loaders.Loader): void {
         let p = loader.progress;
         this.loadingView.setProgress(p);
-        if (p >= 100) {
+        if (p >= 1) {
             loader.off("progress", this.loadProgress, this);
             this.loadingView.dispose();
             this.loadingView = null;
@@ -72,6 +72,7 @@ class Main extends PIXI.Application {
         fgui.UIPackage.addPackage("test");
         let ins = fgui.UIPackage.createObject("test", "main") as fgui.GComponent;
         ins.setSize(fgui.GRoot.inst.width, fgui.GRoot.inst.height);
+        ins.addRelation(fgui.GRoot.inst, fgui.RelationType.Size);
         this.contentlayer.addChild(ins);
 
         this.initClicks(ins);
@@ -86,8 +87,8 @@ class Main extends PIXI.Application {
     private initClicks(ins: fgui.GComponent): void {
 
         this.mainIns = ins;
-        ins.addRelation(fgui.GRoot.inst, fgui.RelationType.Size);
         ins.setSize(fgui.GRoot.inst.width, fgui.GRoot.inst.height);
+        ins.addRelation(fgui.GRoot.inst, fgui.RelationType.Size);
         this.container = ins.getChild("container") as fgui.GComponent;
 
         for (let i = 0; i < ins.numChildren; i++) {
@@ -115,8 +116,8 @@ class Main extends PIXI.Application {
         }
         this.currentDemo = fgui.UIPackage.createObjectFromURL(`ui://test/${name}`) as fgui.GComponent;
         this.currentDemo.name = name;
-        this.currentDemo.addRelation(this.container, fgui.RelationType.Size);
         this.currentDemo.setSize(this.container.width, this.container.height);
+        this.currentDemo.addRelation(this.container, fgui.RelationType.Size);
         this.container.addChild(this.currentDemo);
         this.initDemo(name, this.currentDemo);
         this.mainIns.getController("c1").selectedIndex = 1;