From 8bc440b9b88788cac9a6bf527753222fb6d085c4 Mon Sep 17 00:00:00 2001
From: omigamedev <omarator@gmail.com>
Date: Sun, 12 Nov 2017 22:39:23 +0000
Subject: [PATCH] add xml attributes for combobox node and add resolution
 selection for new doc

---
 data/layout.xml              |  3 ++-
 engine.vcxproj.filters       |  2 +-
 engine/app_dialogs.cpp       |  2 ++
 engine/node.h                |  2 ++
 engine/node_combobox.cpp     | 28 +++++++++++++++++++++++-----
 engine/node_combobox.h       |  3 ++-
 engine/node_dialog_cloud.cpp | 17 -----------------
 engine/node_dialog_open.cpp  |  1 +
 engine/node_dialog_open.h    |  2 ++
 engine/util.cpp              | 17 +++++++++++++++++
 engine/util.h                |  1 +
 11 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/data/layout.xml b/data/layout.xml
index 9137157..caa4f70 100644
--- a/data/layout.xml
+++ b/data/layout.xml
@@ -159,7 +159,7 @@
           </node>
           <border dir="col" align="center" grow="1" width="1" flood-events="1">
             <node height="30" pad="1" width="100%" dir="row">
-              <combobox id="blend-mode" text="Normal" width="100%" height="30"/>
+              <combobox id="blend-mode" text="Normal" width="100%" height="30" combo-list="Normal,Multiply,Screen,Color Dodge" default="0"/>
             </node>
             <node height="20" pad="1" width="100%" dir="row">
               <slider-h id="tip-size"  width="1" grow="1" value=".25"/>
@@ -387,6 +387,7 @@
           <border dir="row" align="center" height="30" color=".2 .2 .2 1">
             <text text="Project name: " font-face="arial" font-size="11" margin="0 5 0 5"/>
             <text-input id="txt-input" justify="center" pad="5" grow="1" height="30" color=".3"/>
+            <combobox id="resolution" width="100" height="30" text="1024" combo-list="512px,1024px,1536px,2048px" default="1"/>
           </border>
           <node height="40" grow="1" dir="row" align="flex-end" justify="flex-end">
             <button id="btn-ok" text="Create Project" width="100" height="30" margin="0 10 0 0"/>
diff --git a/engine.vcxproj.filters b/engine.vcxproj.filters
index 1c82067..d62e3ae 100644
--- a/engine.vcxproj.filters
+++ b/engine.vcxproj.filters
@@ -235,7 +235,7 @@
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="engine\node_combobox.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\ui</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
diff --git a/engine/app_dialogs.cpp b/engine/app_dialogs.cpp
index 31cc948..a421653 100644
--- a/engine/app_dialogs.cpp
+++ b/engine/app_dialogs.cpp
@@ -30,9 +30,11 @@ void App::dialog_newdoc()
                 if (auto docname = layout[main_id]->find<NodeText>("txt-docname"))
                     docname->set_text(("Panodoc: " + doc_name).c_str());
 
+                int res = atoi(dialog->m_resolution->labels[dialog->m_resolution->m_current_index].c_str());
                 layers->clear();
                 canvas->m_canvas->m_layers.clear();
                 canvas->m_canvas->m_order.clear();
+                canvas->m_canvas->resize(res, res);
                 canvas->reset_camera();
                 ActionManager::clear();
 
diff --git a/engine/node.h b/engine/node.h
index 4270240..7c75b73 100644
--- a/engine/node.h
+++ b/engine/node.h
@@ -39,6 +39,8 @@ enum class kAttribute : uint16_t
     Value = const_hash("value"),
     Range = const_hash("range"),
     AspectRatio = const_hash("aspect-ratio"),
+    ComboList = const_hash("combo-list"),
+    Default = const_hash("default"),
 };
 
 enum class kWidget : uint16_t
diff --git a/engine/node_combobox.cpp b/engine/node_combobox.cpp
index 50f9159..a1923d6 100644
--- a/engine/node_combobox.cpp
+++ b/engine/node_combobox.cpp
@@ -8,11 +8,18 @@ Node* NodeComboBox::clone_instantiate() const
     return new NodeComboBox;
 }
 
+void NodeComboBox::clone_copy(Node* dest) const
+{
+    NodeButton::clone_copy(dest);
+    NodeComboBox* n = static_cast<NodeComboBox*>(dest);
+    n->labels = labels;
+    n->m_current_index = m_current_index;
+}
+
 void NodeComboBox::loaded()
 {
     NodeButton::loaded();
     on_click = [this](Node* target) {
-        LOG("ComboBox");
         NodePopupMenu* popup = new NodePopupMenu;
         popup->init();
         popup->create();
@@ -51,8 +58,19 @@ void NodeComboBox::loaded()
         popup->m_capture_children = false;
     };
 }
-void NodeComboBox::clone_copy(Node* dest) const
+
+void NodeComboBox::parse_attributes(kAttribute ka, const tinyxml2::XMLAttribute* attr)
 {
-    NodeButton::clone_copy(dest);
-    NodeComboBox* n = static_cast<NodeComboBox*>(dest);
-}
\ No newline at end of file
+    NodeButton::parse_attributes(ka, attr);
+    switch (ka)
+    {
+    case kAttribute::ComboList:
+    {
+        labels = split(attr->Value(), ',');
+        break;
+    }
+    case kAttribute::Default:
+        m_current_index = attr->IntValue();
+        break;
+    }
+}
diff --git a/engine/node_combobox.h b/engine/node_combobox.h
index 2cf8eb3..ad6c85c 100644
--- a/engine/node_combobox.h
+++ b/engine/node_combobox.h
@@ -5,9 +5,10 @@ class NodeComboBox : public NodeButton
 {
 public:
     std::function<void(Node* target, int index)> on_select;
-    std::array<std::string, 4> labels{ "Normal", "Multiply", "Screen", "Color Dodge" };
+    std::vector<std::string> labels;
     int m_current_index = 0;
     virtual Node* clone_instantiate() const override;
     virtual void clone_copy(Node* dest) const override;
     virtual void loaded() override;
+    virtual void parse_attributes(kAttribute ka, const tinyxml2::XMLAttribute* attr) override;
 };
diff --git a/engine/node_dialog_cloud.cpp b/engine/node_dialog_cloud.cpp
index 12da8ef..413c3d1 100644
--- a/engine/node_dialog_cloud.cpp
+++ b/engine/node_dialog_cloud.cpp
@@ -43,23 +43,6 @@ void NodeDialogCloud::loaded()
 {
 }
 
-std::vector<std::string> split(const std::string& subject, char d, int max_split = 0) 
-{
-    std::vector<std::string> ret;
-    int start = 0;
-    int n = subject.find_first_of(d);
-    while (n != std::string::npos)
-    {
-        ret.push_back(subject.substr(start, n - start));
-        start = n + 1;
-        if (max_split && ret.size() == max_split)
-            break;
-        n = subject.find_first_of(d, start);
-    }
-    ret.push_back(subject.substr(start));
-    return ret;
-}
-
 void NodeDialogCloud::load_thumbs_thread()
 {
     CURL *curl = curl_easy_init();
diff --git a/engine/node_dialog_open.cpp b/engine/node_dialog_open.cpp
index 110a257..bcafc42 100644
--- a/engine/node_dialog_open.cpp
+++ b/engine/node_dialog_open.cpp
@@ -222,6 +222,7 @@ void NodeDialogNewDoc::init()
 void NodeDialogNewDoc::init_controls()
 {
     btn_ok = find<NodeButton>("btn-ok");
+    m_resolution = find<NodeComboBox>("resolution");
     btn_cancel = find<NodeButton>("btn-cancel");
     btn_cancel->on_click = [this](Node*) {
         destroy();
diff --git a/engine/node_dialog_open.h b/engine/node_dialog_open.h
index 2dd5aa2..ad5ef14 100644
--- a/engine/node_dialog_open.h
+++ b/engine/node_dialog_open.h
@@ -4,6 +4,7 @@
 #include "node_image_texture.h"
 #include "node_text.h"
 #include "node_text_input.h"
+#include "node_combobox.h"
 
 class NodeDialogOpenItem : public NodeBorder
 {
@@ -65,6 +66,7 @@ public:
     NodeButton* btn_cancel;
     NodeButton* btn_ok;
     NodeTextInput* input;
+    NodeComboBox* m_resolution;
     virtual Node* clone_instantiate() const override;
     virtual void clone_finalize(Node* dest) const override;
     virtual void init() override;
diff --git a/engine/util.cpp b/engine/util.cpp
index 8454b81..c069c56 100644
--- a/engine/util.cpp
+++ b/engine/util.cpp
@@ -88,6 +88,23 @@ glm::vec3 convert_rgb2hsv(const glm::vec3 c)
     return glm::vec3(fabs(q.z + (q.w - q.y) / (6.0 * d + e)), d / (q.x + e), q.x);
 }
 
+std::vector<std::string> split(const std::string& subject, char d, int max_split/* = 0*/)
+{
+    std::vector<std::string> ret;
+    int start = 0;
+    int n = subject.find_first_of(d);
+    while (n != std::string::npos)
+    {
+        ret.push_back(subject.substr(start, n - start));
+        start = n + 1;
+        if (max_split && ret.size() == max_split)
+            break;
+        n = subject.find_first_of(d, start);
+    }
+    ret.push_back(subject.substr(start));
+    return ret;
+}
+
 static const char* gl2str(GLenum err)
 {
     switch (err)
diff --git a/engine/util.h b/engine/util.h
index 642b0cb..3234666 100644
--- a/engine/util.h
+++ b/engine/util.h
@@ -15,6 +15,7 @@ bool segments_intersect(const glm::vec2& p0a, const glm::vec2& p0b,
 glm::vec4 rand_color();
 glm::vec3 convert_hsv2rgb(const glm::vec3 c);
 glm::vec3 convert_rgb2hsv(const glm::vec3 c);
+std::vector<std::string> split(const std::string& subject, char d, int max_split = 0);
 
 size_t curl_data_handler(void *contents, size_t size, size_t nmemb, void *userp);
 size_t curl_data_write(void *ptr, size_t size, size_t nmemb, FILE *stream);