From d855030309439042831ce9dc86ca368e3f7d0144 Mon Sep 17 00:00:00 2001
From: ttwings <ttwings@qq.com>
Date: Thu, 18 Oct 2018 22:52:49 +0800
Subject: [PATCH] gooi test

---
 .idea/workspace.xml     | 97 ++++++++++++++++++++++++++---------------
 globle.lua              | 15 ++++---
 objects/CreateStage.lua | 45 +++++++++----------
 objects/MainStage.lua   | 30 ++++++-------
 4 files changed, 105 insertions(+), 82 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 25065e6..8d0f7d9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,9 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="a6482d4a-e1b2-49e9-b033-f4637948b153" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/util.lua" beforeDir="false" afterPath="$PROJECT_DIR$/lib/util.lua" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/main.lua" beforeDir="false" afterPath="$PROJECT_DIR$/main.lua" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/objects/CreatStage.lua" beforeDir="false" afterPath="$PROJECT_DIR$/objects/CreateStage.lua" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/globle.lua" beforeDir="false" afterPath="$PROJECT_DIR$/globle.lua" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/objects/CreateStage.lua" beforeDir="false" afterPath="$PROJECT_DIR$/objects/CreateStage.lua" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/objects/MainStage.lua" beforeDir="false" afterPath="$PROJECT_DIR$/objects/MainStage.lua" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
@@ -18,11 +17,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="MainStage.lua" pinned="false" current-in-tab="false">
+      <file leaf-file-name="MainStage.lua" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/objects/MainStage.lua">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="255">
-              <caret line="57" column="27" selection-start-line="57" selection-start-column="12" selection-end-line="57" selection-end-column="27" />
+            <state relative-caret-position="156">
+              <caret line="30" column="52" selection-start-line="30" selection-start-column="52" selection-end-line="30" selection-end-column="52" />
             </state>
           </provider>
         </entry>
@@ -36,11 +35,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="bar.lua" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/gooi/bar.lua">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
       <file leaf-file-name="checkbox.lua" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/gooi/checkbox.lua">
           <provider selected="true" editor-type-id="text-editor" />
@@ -54,15 +48,17 @@
       <file leaf-file-name="component.lua" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/gooi/component.lua">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-2513" />
+            <state relative-caret-position="159">
+              <caret line="413" column="42" lean-forward="true" selection-start-line="413" selection-start-column="42" selection-end-line="413" selection-end-column="42" />
+            </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CreateStage.lua" pinned="false" current-in-tab="true">
+      <file leaf-file-name="CreateStage.lua" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/objects/CreateStage.lua">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="142">
-              <caret line="35" column="84" selection-start-line="35" selection-start-column="84" selection-end-line="35" selection-end-column="84" />
+            <state relative-caret-position="155">
+              <caret line="33" column="57" selection-start-line="33" selection-start-column="57" selection-end-line="33" selection-end-column="57" />
             </state>
           </provider>
         </entry>
@@ -83,6 +79,15 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="globle.lua" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/globle.lua">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="234">
+              <caret line="70" column="30" selection-start-line="70" selection-start-column="30" selection-end-line="70" selection-end-column="30" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="util.lua" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/util.lua">
           <provider selected="true" editor-type-id="text-editor">
@@ -163,7 +168,6 @@
         <option value="$PROJECT_DIR$/GameScreen.lua" />
         <option value="$PROJECT_DIR$/lib/richtext.lua" />
         <option value="$PROJECT_DIR$/lib/Color.lua" />
-        <option value="$PROJECT_DIR$/globle.lua" />
         <option value="$PROJECT_DIR$/objects/InfoPanel.lua" />
         <option value="$PROJECT_DIR$/MainScreen.lua" />
         <option value="$PROJECT_DIR$/NewScreen.lua" />
@@ -181,8 +185,9 @@
         <option value="$PROJECT_DIR$/objects/CreatStage.lua" />
         <option value="$PROJECT_DIR$/main.lua" />
         <option value="$PROJECT_DIR$/objects/Stage.lua" />
-        <option value="$PROJECT_DIR$/objects/MainStage.lua" />
         <option value="$PROJECT_DIR$/objects/CreateStage.lua" />
+        <option value="$PROJECT_DIR$/globle.lua" />
+        <option value="$PROJECT_DIR$/objects/MainStage.lua" />
       </list>
     </option>
   </component>
@@ -489,7 +494,21 @@
       <option name="project" value="LOCAL" />
       <updated>1539536337050</updated>
     </task>
-    <option name="localTasksCounter" value="20" />
+    <task id="LOCAL-00020" summary="gooi lib test.switch stage test.">
+      <created>1539796918850</created>
+      <option name="number" value="00020" />
+      <option name="presentableId" value="LOCAL-00020" />
+      <option name="project" value="LOCAL" />
+      <updated>1539796918850</updated>
+    </task>
+    <task id="LOCAL-00021" summary="gooi lib test.switch stage test.">
+      <created>1539797567057</created>
+      <option name="number" value="00021" />
+      <option name="presentableId" value="LOCAL-00021" />
+      <option name="project" value="LOCAL" />
+      <updated>1539797567057</updated>
+    </task>
+    <option name="localTasksCounter" value="22" />
     <servers />
   </component>
   <component name="TodoView">
@@ -515,7 +534,7 @@
       <window_info anchor="bottom" id="Version Control" order="1" sideWeight="0.4944238" weight="0.32948717" />
       <window_info anchor="bottom" id="Terminal" order="2" />
       <window_info id="Designer" order="2" />
-      <window_info content_ui="combo" id="Project" order="3" weight="0.12193309" />
+      <window_info content_ui="combo" id="Project" order="3" visible="true" weight="0.12193309" />
       <window_info id="Structure" order="4" side_tool="true" weight="0.25" />
       <window_info anchor="right" id="Ant Build" order="4" weight="0.25" />
       <window_info id="UI Designer" order="0" />
@@ -603,7 +622,8 @@
     <MESSAGE value="修改readme" />
     <MESSAGE value="重构第一步。结构采用新的场景控制。" />
     <MESSAGE value="gooi lib test." />
-    <option name="LAST_COMMIT_MESSAGE" value="gooi lib test." />
+    <MESSAGE value="gooi lib test.switch stage test." />
+    <option name="LAST_COMMIT_MESSAGE" value="gooi lib test.switch stage test." />
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/MainScreen.lua">
@@ -830,11 +850,6 @@
     <entry file="file://$PROJECT_DIR$/lib/gooi/checkbox.lua">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/gooi/component.lua">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2513" />
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/gooi/init.lua">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-765" />
@@ -864,13 +879,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/objects/MainStage.lua">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="57" column="27" selection-start-line="57" selection-start-column="12" selection-end-line="57" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/main.lua">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="721">
@@ -880,8 +888,29 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/objects/CreateStage.lua">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="142">
-          <caret line="35" column="84" selection-start-line="35" selection-start-column="84" selection-end-line="35" selection-end-column="84" />
+        <state relative-caret-position="155">
+          <caret line="33" column="57" selection-start-line="33" selection-start-column="57" selection-end-line="33" selection-end-column="57" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/globle.lua">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="234">
+          <caret line="70" column="30" selection-start-line="70" selection-start-column="30" selection-end-line="70" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/gooi/component.lua">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="159">
+          <caret line="413" column="42" lean-forward="true" selection-start-line="413" selection-start-column="42" selection-end-line="413" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/objects/MainStage.lua">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="156">
+          <caret line="30" column="52" selection-start-line="30" selection-start-column="52" selection-end-line="30" selection-end-column="52" />
         </state>
       </provider>
     </entry>
diff --git a/globle.lua b/globle.lua
index 1f10c68..0e885a7 100644
--- a/globle.lua
+++ b/globle.lua
@@ -68,13 +68,14 @@ text_style['q3'] = quality_colors[3]
 text_style['q2'] = quality_colors[2]
 text_style['q1'] = quality_colors[1]
 
-text_style.font56 = assets.font.myfont(56)
-text_style.font48 = assets.font.myfont(48)
-text_style.font32 = assets.font.myfont(32)
-text_style.font28 = assets.font.myfont(28)
-text_style.font24 = assets.font.myfont(24)
-text_style.font20 = assets.font.myfont(20)
-text_style.font18 = assets.font.myfont(18)
+font80 = assets.font.myfont(80)
+font56 = assets.font.myfont(56)
+font48 = assets.font.myfont(48)
+font32 = assets.font.myfont(32)
+font28 = assets.font.myfont(28)
+font24 = assets.font.myfont(24)
+font20 = assets.font.myfont(20)
+font18 = assets.font.myfont(18)
 
 
 
diff --git a/objects/CreateStage.lua b/objects/CreateStage.lua
index 997349e..127ad37 100644
--- a/objects/CreateStage.lua
+++ b/objects/CreateStage.lua
@@ -8,9 +8,10 @@
 CreateStage = Class("CreateStage",Stage)
 
 local style = {
-    font = assets.font.myfont(32),
+    font = assets.font.myfont(18),
     showBorder = true,
     bgColor = {0.208, 0.220, 0.222,0.222},
+    group = "CreatStage"
     --fgColor = {1,0,0}
 }
 
@@ -21,34 +22,30 @@ function CreateStage:init()
     self.background = assets.graphics.Backgrounds.bg
     local title_font = assets.font.myfont(80)
     self.ui = gooi
-    self.ui.desktopMode()
     self.ui_group = "CreateStage"
-    --self.ui.desktopMode()
-    --self.ui.shadow()
-    --self.ui.setStyle({font = title_font})
-    self.ui.newLabel({group = self.ui_group,text = "创建侠客",x = gw/3,y=gh/6}):center():setStyle({font=title_font}):fg({0,0,0})
+    self.ui.newLabel({group = self.ui_group,text = "创建侠客",x = gw/3,y=gh/10})
+            :center():setStyle({font=title_font}):fg({0,0,0})
     self.ui.setStyle(style)
-    --gooi.glass()
-    --self.panel = self.ui.newPanel({x = 500,y = 500,w = 150,h = 36,layout = "grid 4x1"})
-
-    --self.ui.newButton({text = "新的穿越",x = 500,y = 500,w = 150,h = 36})
-    --self.ui.newButton({text = "梦回武林",x = 500,y = 550,w = 150,h = 36})
-    --self.ui.newButton({text = "侠客宝典",x = 500,y = 600,w = 150,h = 36})
-    self.ui.newButton({group = self.ui_group,text = "返回太虚",x = gw - 200,y = gh - 100,w = 150,h = 36})
-             :onRelease(
+    self.ui.desktopMode()
+    self.ui.shadow()
+---- no border bug
+    local font18 = assets.font.myfont(18)
+    self.panel = self.ui.newPanel({x = 10, y = 200, w = 200, h = 270, layout = "grid 10x3"})
+    self.panel:setStyle({bgColor = {0.208, 0.220, 0.222},fgColor = {0,0,0},font = font18 })
+    self.panel:add(self.ui.newLabel({group = self.ui_group,text = "姓名"}))
+    self.panel:add(self.ui.newLabel({group = self.ui_group,text = "悟道"}))
+    self.panel:add(self.ui.newButton({group = self.ui_group,text = "变更"}))
+    self.panel:add(self.ui.newLabel({group = self.ui_group,text = "性别"}))
+    self.panel:add(self.ui.newLabel({group = self.ui_group,text = "男"}))
+    self.panel:add(self.ui.newButton({group = self.ui_group,text = "变更"}))
+    self.panel:add(self.ui.newLabel({group = self.ui_group,text = "年龄"}))
+    self.panel:add(self.ui.newLabel({group = self.ui_group,text = "18"}))
+    self.panel:add(self.ui.newButton({group = self.ui_group,text = "变更"}))
+    self.ui.newButton({group = self.ui_group,text = "返回太虚",x = gw - 200,y = gh - 100})
+            :onRelease(
             function ()
-                p_print("goto main")
                 gotoRoom("MainStage","MainStage")
             end)
-            --function()
-            --    self.ui.confirm({group = self.ui_group,text = "梦醒",okText = "是",cancelText = "否"
-            --    ,ok = function ()
-            --            p_print("goto main")
-            --            gotoRoom("MainStage","MainStage")
-            --        end})
-            --end
-    --)
-    --gooi.setCanvas(self.main_canvas)
 end
 
 function CreateStage:activate()
diff --git a/objects/MainStage.lua b/objects/MainStage.lua
index 4140e0e..a3c5db8 100644
--- a/objects/MainStage.lua
+++ b/objects/MainStage.lua
@@ -9,9 +9,10 @@ MainStage = Class("MainStage",Stage)
 
 --- init
 local style = {
-    font = assets.font.myfont(32),
+    font = font24,
     showBorder = true,
     bgColor = {0.208, 0.220, 0.222,0.222},
+    group = "MainStage"
     --fgColor = {1,0,0}
 }
 
@@ -21,32 +22,27 @@ function MainStage:init()
     self.area:addPhysicsWorld()
     self.main_canvas = love.graphics.newCanvas(gw,gh)
     self.background = assets.graphics.Backgrounds.bg
-    local title_font = assets.font.myfont(80)
     self.ui = gooi
     self.ui.desktopMode()
     self.ui_group = "MainStage"
-    self.ui.setStyle({font = title_font})
-    --self.panel = self.ui.newPanel({x = gw/2,y = hg/2,w = 200,h = 120,layout = "grid 4x1"})
-    self.ui.newLabel({text = "武侠与江湖",x = gw/3,y=gh/6,group = self.ui_group}):fg({0,0,0}):center()
     self.ui.setStyle(style)
-    --gooi.glass()
-    --gooi.newPanel()
-    self.ui.newButton({text = "新的穿越",x = 500,y = 500,w = 150,h = 36,group = self.ui_group})
-            :onRelease(
+    self.ui.newLabel({text = "武侠与江湖",x = gw/2 - 320,y=gh/6,w = 320,group = self.ui_group}):setStyle({font = font80}):fg({0,0,0}):center()
+    self.panel = self.ui.newPanel({x = gw/2 - 80,y = gh/2,w = 160,h = 160,layout = "grid 4x1"})
+    self.panel:add(self.ui.newButton({text = "新的穿越",group = self.ui_group}):setStyle({font = font32})
+                       :onRelease(
             function()
                 gotoRoom("CreateStage","CreateStage")
             end)
-    self.ui.newButton({text = "梦回武林",x = 500,y = 550,w = 150,h = 36,group = self.ui_group})
-    self.ui.newButton({text = "侠客宝典",x = 500,y = 600,w = 150,h = 36,group = self.ui_group})
-    self.ui.newButton({text = "归隐山林",x = 500,y = 650,w = 150,h = 36,group = self.ui_group})
-            :onRelease(
+    )
+    self.panel:add(self.ui.newButton({text = "梦回武林",group = self.ui_group})):setStyle({font = font32})
+    self.panel:add(self.ui.newButton({text = "侠客宝典",group = self.ui_group})):setStyle({font = font32})
+    self.panel:add(self.ui.newButton({text = "归隐山林",group = self.ui_group}):setStyle({font = font32})
+                       :onRelease(
             function()
-                p_print("Main")
                 self.ui.confirm({group = self.ui_group,text = "梦醒",okText = "是",cancelText = "否",ok = function () love.event.quit() end})
             end
-    )
-    --self.area:addObject()
-    --gooi.setCanvas(self.main_canvas)
+    ))
+
 end
 
 function MainStage:activate()