SumGuyV5/SDLPongCPP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BoxSizer to Sizer

Browse Source
This commit is contained in:
Richard Allen
2018-08-15 22:04:06 -04:00
parent 353dc21750
commit bd3c111fa1
67 changed files with 369 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TrooperEngineTest/GUIEngineTest/GUIXMLTest.cpp
+4 -4
View File
@@ -27,7 +27,7 @@ void GUIXMLTest()
// align = leftRight;
// }
GUIXMLBoxSizerTest();
GUIXMLSizerTest();
}
void GUIXMLDefaultTest()
@@ -270,11 +270,11 @@ void GUIXMLAlignTest( const GUIHelpers::eAlign one /*= GUIHelpers::eAlign::DEFAU
GUIEngine::cGUI::Inst().Delete();
}
void GUIXMLBoxSizerTest()
void GUIXMLSizerTest()
{
UTest u("GUI XML BoxSizer");
LoadFile("GUIXMLBoxSizerTest.xml", true);
LoadFile("GUIXMLSizerTest.xml", true);
std::vector<GUIEngine::cWindow*> objects = GUIEngine::cGUI::Inst().GetObjects();
@@ -297,7 +297,7 @@ void GUIXMLBoxSizerTest()
cWindowTest("Layout", u, layout, sets);
GUIEngine::cBoxSizer* boxsizer = (GUIEngine::cBoxSizer*)layout->getChildren()[0];
GUIEngine::cSizer* boxsizer = (GUIEngine::cSizer*)layout->getChildren()[0];
sets.pos = { 51, 15 };
sets.size = { 172, 5 };
TrooperEngineTest/GUIEngineTest/GUIXMLTest.hpp
+1 -1
View File
@@ -25,7 +25,7 @@ void GUIXMLPositionTest();
void GUIXMLAlignTest( const GUIHelpers::eAlign one = GUIHelpers::eAlign::DEFAULT_ALIGN, const GUIHelpers::eAlign two = GUIHelpers::eAlign::DEFAULT_ALIGN,
const GUIHelpers::eAlign three = GUIHelpers::eAlign::DEFAULT_ALIGN, const GUIHelpers::eOrientation orientation = GUIHelpers::eOrientation::DEFAULT_ORIENTATION);
void GUIXMLBoxSizerTest();
void GUIXMLSizerTest();
void LoadFile( const cString& filename, const bool show = false );
TrooperEngineTest/TrooperEngineTest.vcxproj
+1 -1
View File
@@ -170,7 +170,7 @@
<ItemGroup>
<Xml Include="xml\GUI.xml" />
<Xml Include="xml\GUIXMLAlignTest.xml" />
<Xml Include="xml\GUIXMLBoxSizerTest.xml" />
<Xml Include="xml\GUIXMLSizerTest.xml" />
<Xml Include="xml\GUIXMLDefaultTest.xml">
<SubType>Designer</SubType>
</Xml>
TrooperEngineTest/TrooperEngineTest.vcxproj.filters
+1 -1
View File
@@ -95,7 +95,7 @@
<Xml Include="xml\GUIXMLAlignTest.xml">
<Filter>xml</Filter>
</Xml>
<Xml Include="xml\GUIXMLBoxSizerTest.xml">
<Xml Include="xml\GUIXMLSizerTest.xml">
<Filter>xml</Filter>
</Xml>
</ItemGroup>
TrooperEngineTest/xml/GUIXMLAlignTest.xml
+3 -3
View File
@@ -2,8 +2,8 @@
<Panel size="400,400">
<debug/>
<Layout>
<Label align="left" text="Hello world Left" />
<Label align="center" text="Hello world Center" />
<Label align="right" text="Hello world Right" />
<Label align="left">Hello world Left</Label>
<Label align="center">Hello world Center</Label>
<Label align="right">Hello world Right</Label>
</Layout>
</Panel>
TrooperEngineTest/xml/GUIXMLBoxSizerTest.xml
-9
View File
@@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Panel size="200,200">
<debug />
<Layout>
<Boxsizer />
<Label text="Box Sizer" />
<Boxsizer />
</Layout>
</Panel>
TrooperEngineTest/xml/GUIXMLDefaultTest.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<Panel size="200,200">
<debug/>
<Layout>
<Label text="Hello world" />
<Label>Hello world</Label>
<Include dir ="xml/" filename="include.xml"/>
</Layout>
</Panel>
TrooperEngineTest/xml/GUIXMLSizerTest.xml
+11
View File
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Panel size="200,200">
<debug />
<Layout>
<!--<Include dir ="xml/" filename="include.xml"/>-->
<Sizer />
<Label>Sizer</Label>
<Sizer />
<Sizer />
</Layout>
</Panel>
TrooperEngineTest/xml/include.xml
+2 -2
View File
@@ -1,3 +1,3 @@
<?xml version="1.0"?>
<Boxsizer />
<Label text="Box Sizer" />
<Sizer />
<Label>Sizer</Label>