From e2792534bce3671f343a4d5ea73e6373425b162a Mon Sep 17 00:00:00 2001
From: omigamedev <omarator@gmail.com>
Date: Thu, 2 Feb 2017 23:10:05 +0000
Subject: [PATCH] edit the example layout to add more details

---
 data/layout.xml | 49 ++++++++++++++++++++++++++-----------------------
 engine/app.cpp  |  2 +-
 engine/main.cpp |  2 +-
 3 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/data/layout.xml b/data/layout.xml
index 3e55d57..41fcced 100644
--- a/data/layout.xml
+++ b/data/layout.xml
@@ -14,6 +14,10 @@
       <ref id="multi-button-item"/>
     </node>
   </layout>
+  <layout id="rounded-inside">
+    <border thickness="2" border-color=".9" color=".4" height="100%" pad="10">
+    </border>
+  </layout>
   <layout id="main">
     <node dir="col" wrap="0" width="100%" height="100%" pad="5">
       <!-- toolbar -->
@@ -22,13 +26,14 @@
         <ref id="multi-button"/>
         <ref id="multi-button"/>
         <ref id="button"></ref>
-        <border width="50" margin="0 5 0 0" color=".1" thickness="2" border-color="1"></border>
-        <border width="50" margin="0 5 0 0" color=".2" thickness="2" border-color="1"></border>
-        <border width="50" margin="0 5 0 0" color=".3" thickness="2" border-color="1"></border>
         <separator width="10" />
-        <border width="50" margin="0 5 0 0" color=".1" thickness="2" border-color="1"></border>
-        <border width="50" margin="0 5 0 0" color=".2" thickness="2" border-color="1"></border>
-        <border width="50" margin="0 5 0 0" color=".3" thickness="2" border-color="1"></border>
+        <border width="50" margin="0 5 0 0" color=".1" thickness="2" border-color=".5"></border>
+        <border width="50" margin="0 5 0 0" color=".2" thickness="2" border-color=".5"></border>
+        <border width="50" margin="0 5 0 0" color=".3" thickness="2" border-color=".5"></border>
+        <separator width="10" />
+        <border width="50" margin="0 5 0 0" color=".1" thickness="2" border-color=".7"></border>
+        <border width="50" margin="0 5 0 0" color=".2" thickness="2" border-color=".7"></border>
+        <border width="50" margin="0 5 0 0" color=".3" thickness="2" border-color=".7"></border>
         <separator width="10" />
         <border width="50" margin="0 5 0 0"></border>
         <border width="50" margin="0 5 0 0"></border>
@@ -38,28 +43,26 @@
       <plane grow="1" dir="row" wrap="1" height="0">
         <!-- side bar -->
         <plane width="200" height="100%" dir="col" color=".2">
-          <plane pad="15" margin="0 0 10 0" color=".3" width="100%" height="auto">
-            <plane height="30" color=".4" />
-            <plane height="30" color=".4" />
-            <plane height="30" color=".4" />
-            <plane height="30" color=".4" />
-          </plane>
-          <plane pad="15" margin="0 0 10 0" color=".3" width="100%" height="auto">
-            <plane height="30" color=".4" />
-            <plane height="30" color=".4" />
-            <plane height="30" color=".4" />
-            <plane height="30" color=".4" />
-          </plane>
+          <border pad="15" margin="10 0 10 0" color=".3" width="100%" height="auto">
+            <border height="30" color=".4" />
+            <border height="30" color=".4" />
+            <border height="30" color=".4" />
+            <border height="30" color=".4" />
+          </border>
+          <border pad="15" margin="0 0 10 0" color=".3" width="100%" height="auto">
+            <border height="30" color=".4" />
+            <border height="30" color=".4" />
+            <border height="30" color=".4" />
+            <border height="30" color=".4" />
+          </border>
         </plane>
         <!-- content panel -->
-        <plane width="1" grow="1" height="100%" pad="30" wrap="1">
-          <border thickness="5" border-color="1" color=".4" height="100%" pad="10">
-            <shape type="round-rect" border-color=".5" thickness="4" width="100%" height="100%"></shape>
-          </border>
+        <plane width="1" grow="1" height="100%" pad="10" wrap="1">
+          <ref id="rounded-inside"/>
         </plane>
       </plane>
       <!-- status bar -->
-      <plane height="30" width="100%" />
+      <border height="30" width="100%" color=".15" border-color=".3" />
     </node>
   </layout>
 </root>
diff --git a/engine/app.cpp b/engine/app.cpp
index e0bd349..e821674 100644
--- a/engine/app.cpp
+++ b/engine/app.cpp
@@ -192,7 +192,7 @@ void App::update(float dt)
     ShaderManager::u_mat4(kShaderUniform::MVP, proj * tran);
     ShaderManager::u_vec2(kShaderUniform::Tof, tof);
     ShaderManager::u_vec2(kShaderUniform::Tsz, tsz);
-    plane.draw_fill();
+    //plane.draw_fill();
     font_tex.unbind();
     sampler.unbind();
 }
diff --git a/engine/main.cpp b/engine/main.cpp
index 3d363c2..5f19129 100644
--- a/engine/main.cpp
+++ b/engine/main.cpp
@@ -386,7 +386,7 @@ int main()
         wglDeleteContext(hRC);
         DestroyWindow(hWnd);
 
-        hWnd = CreateWindow(wc.lpszClassName, L"UI Layout Engine", WS_OVERLAPPEDWINDOW,
+        hWnd = CreateWindow(wc.lpszClassName, L"UI Layout Engine - OpenGL 3.1", WS_OVERLAPPEDWINDOW,
             CW_USEDEFAULT, CW_USEDEFAULT, clientRect.right - clientRect.left,
             clientRect.bottom - clientRect.top, 0, 0, hInst, 0);