From e068ad9e28b14bfb500d49aaa71dc053b470d7c5 Mon Sep 17 00:00:00 2001
From: Andrew Belt <andrewpbelt@gmail.com>
Date: Wed, 6 Jun 2018 11:15:57 -0400
Subject: [PATCH] Add example icon to toolbar

---
 include/ui.hpp        |  6 +++++
 res/icons/LICENSE.md  |  2 ++
 res/icons/file.svg    | 56 +++++++++++++++++++++++++++++++++++++++++++
 src/app/Toolbar.cpp   | 14 +++++++++++
 src/ui/Button.cpp     |  1 +
 src/ui/IconButton.cpp | 19 +++++++++++++++
 6 files changed, 98 insertions(+)
 create mode 100644 res/icons/LICENSE.md
 create mode 100644 res/icons/file.svg
 create mode 100644 src/ui/IconButton.cpp

diff --git a/include/ui.hpp b/include/ui.hpp
index 57e6fa47..4ddd5a19 100644
--- a/include/ui.hpp
+++ b/include/ui.hpp
@@ -154,6 +154,12 @@ struct Button : OpaqueWidget {
 	void onDragDrop(EventDragDrop &e) override;
 };
 
+struct IconButton : Button {
+	SVGWidget *sw;
+	IconButton();
+	void setSVG(std::shared_ptr<SVG> svg);
+};
+
 struct ChoiceButton : Button {
 	void draw(NVGcontext *vg) override;
 };
diff --git a/res/icons/LICENSE.md b/res/icons/LICENSE.md
new file mode 100644
index 00000000..cbff1d61
--- /dev/null
+++ b/res/icons/LICENSE.md
@@ -0,0 +1,2 @@
+SVG icons in this directory are licensed under the CC BY 4.0 License by Font Awesome.
+https://fontawesome.com/license
diff --git a/res/icons/file.svg b/res/icons/file.svg
new file mode 100644
index 00000000..a369c472
--- /dev/null
+++ b/res/icons/file.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="file.svg"
+   width="16"
+   height="16"
+   inkscape:version="0.92.2 2405546, 2018-03-11">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1600"
+     inkscape:window-height="882"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="10.429825"
+     inkscape:cx="15.764779"
+     inkscape:cy="22.936865"
+     inkscape:window-x="0"
+     inkscape:window-y="18"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4" />
+  <path
+     d="M 12.168717,4.2964265 10.202695,2.3304042 C 9.9917985,2.1195079 9.7059169,2 9.4083187,2 H 4.6256591 C 4.0046866,2.0023433 3.5008788,2.5061511 3.5008788,3.1271236 V 12.87522 C 3.5008788,13.496192 4.0046866,14 4.6256591,14 h 6.7486819 c 0.620972,0 1.12478,-0.503808 1.12478,-1.12478 V 5.0931459 c 0,-0.2975982 -0.119508,-0.5858231 -0.330404,-0.7967194 z m -0.885764,0.705331 H 9.4997071 V 3.218512 Z M 4.6256591,12.87522 V 3.1271236 h 3.7492677 v 2.437024 c 0,0.3116579 0.2507323,0.5623902 0.5623902,0.5623902 h 2.437024 V 12.87522 Z"
+     id="path2"
+     style="fill:#808080;fill-opacity:1;stroke-width:0.02343292"
+     inkscape:connector-curvature="0" />
+</svg>
diff --git a/src/app/Toolbar.cpp b/src/app/Toolbar.cpp
index b1d5a9a1..7da3be57 100644
--- a/src/app/Toolbar.cpp
+++ b/src/app/Toolbar.cpp
@@ -1,11 +1,22 @@
 #include "app.hpp"
 #include "window.hpp"
 #include "engine.hpp"
+#include "asset.hpp"
 
 
 namespace rack {
 
 
+struct NewButton : IconButton {
+	NewButton() {
+		setSVG(SVG::load(assetGlobal("res/icons/file.svg")));
+	}
+	void onAction(EventAction &e) override {
+		gRackWidget->reset();
+	}
+};
+
+
 struct NewItem : MenuItem {
 	void onAction(EventAction &e) override {
 		gRackWidget->reset();
@@ -114,6 +125,9 @@ Toolbar::Toolbar() {
 	layout->spacing = 5;
 	addChild(layout);
 
+	NewButton *newButton = new NewButton();
+	layout->addChild(newButton);
+
 	ChoiceButton *fileChoice = new FileChoice();
 	fileChoice->box.size.x = 100;
 	fileChoice->text = "File";
diff --git a/src/ui/Button.cpp b/src/ui/Button.cpp
index 4491c44b..b39457ba 100644
--- a/src/ui/Button.cpp
+++ b/src/ui/Button.cpp
@@ -5,6 +5,7 @@ namespace rack {
 
 void Button::draw(NVGcontext *vg) {
 	bndToolButton(vg, 0.0, 0.0, box.size.x, box.size.y, BND_CORNER_NONE, state, -1, text.c_str());
+	Widget::draw(vg);
 }
 
 void Button::onMouseEnter(EventMouseEnter &e) {
diff --git a/src/ui/IconButton.cpp b/src/ui/IconButton.cpp
new file mode 100644
index 00000000..31fa427e
--- /dev/null
+++ b/src/ui/IconButton.cpp
@@ -0,0 +1,19 @@
+#include "ui.hpp"
+
+
+namespace rack {
+
+
+IconButton::IconButton() {
+	box.size.x = BND_WIDGET_HEIGHT;
+	sw = new SVGWidget();
+	sw->box.pos = Vec(2.75, 1.75);
+	addChild(sw);
+}
+
+void IconButton::setSVG(std::shared_ptr<SVG> svg) {
+	sw->setSVG(svg);
+}
+
+
+} // namespace rack