diff --git a/sutk/source/tests/ThemeLoadTest.cpp b/sutk/source/tests/ThemeLoadTest.cpp index 37edb752..982e95a1 100644 --- a/sutk/source/tests/ThemeLoadTest.cpp +++ b/sutk/source/tests/ThemeLoadTest.cpp @@ -48,6 +48,22 @@ namespace SUTK m_renderRect = m_uiDriver->createRenderable(m_renderRectContainer); themeInt->bind("Folder.Open", std::bind(&RenderImage::setImage, m_renderRect, std::placeholders::_1)); + Container* emptyContainer1 = m_uiDriver->createContainer(rootContainer); + emptyContainer1->setRect({ 1.0f, 1.0f, 7.0f, 7.0f }); + AnchorRect* anchor1 = emptyContainer1->getAnchorRect(); + anchor1->setTopLeft({ 0, 0 }); + anchor1->setBottomRight({ 1, 1 }); + RenderableContainer* renderRectContainer1 = m_uiDriver->createContainer(emptyContainer1); + renderRectContainer1->setRect({ 7.0f, 1.0f, 5, 5 }); + anchor1 = renderRectContainer1->getAnchorRect(); + anchor1->setTopLeft({ 1, 1 }); + anchor1->setBottomRight({ 1, 1 }); + emptyContainer1->setRect({ 1.0f, 1.0f, 9.0f, 7.0f }); + emptyContainer1->setRect({ 1.0f, 1.0f, 11.0f, 7.0f }); + RenderImage* renderImage = m_uiDriver->createRenderable(renderRectContainer1); + themeInt->bind("Folder.Open.VG", std::bind(&RenderImage::setImage, renderImage, std::placeholders::_1)); + renderImage->setColor(Color4::white()); + RenderableContainer* renderRectContainer2 = m_uiDriver->createContainer(rootContainer); RenderRectFill* renderRect2 = m_uiDriver->createRenderable(renderRectContainer2); renderRectContainer2->setRect({ 5.0f, 10.0f, 5.0f, 5.0f }); diff --git a/sutk/svg_files/apple-svgrepo-com.svg b/sutk/svg_files/apple-svgrepo-com.svg new file mode 100644 index 00000000..4a83e4d1 --- /dev/null +++ b/sutk/svg_files/apple-svgrepo-com.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/sutk/themes/model.tmdl b/sutk/themes/model.tmdl index 8b38b55e..c9ba12d1 100644 --- a/sutk/themes/model.tmdl +++ b/sutk/themes/model.tmdl @@ -16,5 +16,7 @@ ThemeModel [Image] Folder.Open; [Image] + Folder.Open.VG; + [Image] Folder.Close; } \ No newline at end of file diff --git a/sutk/themes/theme1.theme b/sutk/themes/theme1.theme index 5ca9aeee..49d75bee 100644 --- a/sutk/themes/theme1.theme +++ b/sutk/themes/theme1.theme @@ -9,5 +9,6 @@ Theme SmallButton.HoverColor = red { 1.0f }; SmallButton.PressColor = grey { 1.0f }; Folder.Open = "../textures/Thalita-Torres-Office-Archive-folders.512.png"; + Folder.Open.VG = "svg_files/close-cross-symbol-in-a-circle-svgrepo-com.svg"; Folder.Close = "icons/Folder-Close.png"; } diff --git a/sutk/themes/theme2.theme b/sutk/themes/theme2.theme index 0ab67bcf..3cd428f0 100644 --- a/sutk/themes/theme2.theme +++ b/sutk/themes/theme2.theme @@ -9,5 +9,6 @@ Theme SmallButton.HoverColor = red { 1.0f }; SmallButton.PressColor = grey { 1.0f }; Folder.Open = "../textures/Smile.bmp"; + Folder.Open.VG = "svg_files/apple-svgrepo-com.svg"; Folder.Close = "icons/Folder-Close.png"; }