From f45a7c2e673fc851f07f274799628cfa024ff213 Mon Sep 17 00:00:00 2001
From: omigamedev <omarator@gmail.com>
Date: Fri, 9 Mar 2018 14:22:40 +0100
Subject: [PATCH] revert old color picker, enable animation toolbar

---
 data/layout.xml       |  2 --
 engine/app_layout.cpp | 13 ++++++-------
 engine/main.cpp       |  3 +++
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/data/layout.xml b/data/layout.xml
index 136c0fa..c5e4c05 100644
--- a/data/layout.xml
+++ b/data/layout.xml
@@ -724,13 +724,11 @@
           </scroll>
         </node>
         <!-- timeline -->
-        <!--
         <node height="100%" width="1" grow="1" dir="col" justify="flex-end">
           <border color=".3 .3 .3 .4" height="50" width="100%" pad="10">
             <slider-h id="frames-slider"></slider-h>
           </border>
         </node>
-        -->
       </node>
       <!-- status bar -->
       <!--<border height="30" width="100%" color=".15" border-color=".3" dir="row" pad="0 0 0 10" align="center">
diff --git a/engine/app_layout.cpp b/engine/app_layout.cpp
index 9793f7e..d808370 100644
--- a/engine/app_layout.cpp
+++ b/engine/app_layout.cpp
@@ -220,11 +220,11 @@ void App::init_sidebar()
     if (auto* button = layout[main_id]->find<NodeButtonCustom>("btn-color"))
     {
         button->on_click = [this, button](Node*) {
-//            panels->get_child_index(color.get()) == -1 ? panels->add_child(color) : panels->remove_child(color.get());
-//            panels->fix_scroll();
-//            button->set_color(panels->get_child_index(color.get()) == -1 ? color_button_normal : color_button_hlight);
-            auto pick = layout[main_id]->add_child<NodeColorPicker>();
-            pick->m_color_cur->m_color = ui::Canvas::I->m_current_brush.m_tip_color;
+            panels->get_child_index(color.get()) == -1 ? panels->add_child(color) : panels->remove_child(color.get());
+            panels->fix_scroll();
+            button->set_color(panels->get_child_index(color.get()) == -1 ? color_button_normal : color_button_hlight);
+//             auto pick = layout[main_id]->add_child<NodeColorPicker>();
+//             pick->m_color_cur->m_color = ui::Canvas::I->m_current_brush.m_tip_color;
         };
     }
     if (auto* button = layout[main_id]->find<NodeButtonCustom>("btn-layer"))
@@ -577,7 +577,7 @@ void App::initLayout()
         YGNodeStyleSetPosition(n->y_node, YGEdgeLeft, 15);
         n->SetSize(30, 45);
         layout[main_id]->add_child(n);
-/*
+
         if (auto* slider = layout[main_id]->find<NodeSliderH>("frames-slider"))
         {
             slider->on_value_changed = [this](Node*, float value)
@@ -601,7 +601,6 @@ void App::initLayout()
                 }
             };
         }
-*/
     };
     LOG("initializing layout xml");
     if (layout.m_loaded)
diff --git a/engine/main.cpp b/engine/main.cpp
index ce63527..e1d6202 100644
--- a/engine/main.cpp
+++ b/engine/main.cpp
@@ -432,6 +432,9 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
     static POINT lastPoint;
     switch (msg)
     {
+    case WM_PAINT:
+        App::I.redraw = true;
+        break;
     case WM_CREATE:
         BT_SetTerminate();
         break;