omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert old color picker, enable animation toolbar

Browse Source
This commit is contained in:
omigamedev
2018-03-09 14:22:40 +01:00
parent 8a962d4cdf
commit f45a7c2e67
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/layout.xml
View File

@@ -724,13 +724,11 @@
</scroll> </scroll>
</node> </node>
<!-- timeline --> <!-- timeline -->
<!--
<node height="100%" width="1" grow="1" dir="col" justify="flex-end"> <node height="100%" width="1" grow="1" dir="col" justify="flex-end">
<border color=".3 .3 .3 .4" height="50" width="100%" pad="10"> <border color=".3 .3 .3 .4" height="50" width="100%" pad="10">
<slider-h id="frames-slider"></slider-h> <slider-h id="frames-slider"></slider-h>
</border> </border>
</node> </node>
-->
</node> </node>
<!-- status bar --> <!-- status bar -->
<!--<border height="30" width="100%" color=".15" border-color=".3" dir="row" pad="0 0 0 10" align="center"> <!--<border height="30" width="100%" color=".15" border-color=".3" dir="row" pad="0 0 0 10" align="center">

13
engine/app_layout.cpp
View File

@@ -220,11 +220,11 @@ void App::init_sidebar()
if (auto* button = layout[main_id]->find<NodeButtonCustom>("btn-color")) if (auto* button = layout[main_id]->find<NodeButtonCustom>("btn-color"))
{ {
button->on_click = [this, button](Node*) { button->on_click = [this, button](Node*) {
// panels->get_child_index(color.get()) == -1 ? panels->add_child(color) : panels->remove_child(color.get()); panels->get_child_index(color.get()) == -1 ? panels->add_child(color) : panels->remove_child(color.get());
// panels->fix_scroll(); panels->fix_scroll();
// button->set_color(panels->get_child_index(color.get()) == -1 ? color_button_normal : color_button_hlight); button->set_color(panels->get_child_index(color.get()) == -1 ? color_button_normal : color_button_hlight);
auto pick = layout[main_id]->add_child<NodeColorPicker>(); // auto pick = layout[main_id]->add_child<NodeColorPicker>();
pick->m_color_cur->m_color = ui::Canvas::I->m_current_brush.m_tip_color; // 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")) if (auto* button = layout[main_id]->find<NodeButtonCustom>("btn-layer"))
@@ -577,7 +577,7 @@ void App::initLayout()
YGNodeStyleSetPosition(n->y_node, YGEdgeLeft, 15); YGNodeStyleSetPosition(n->y_node, YGEdgeLeft, 15);
n->SetSize(30, 45); n->SetSize(30, 45);
layout[main_id]->add_child(n); layout[main_id]->add_child(n);
/*
if (auto* slider = layout[main_id]->find<NodeSliderH>("frames-slider")) if (auto* slider = layout[main_id]->find<NodeSliderH>("frames-slider"))
{ {
slider->on_value_changed = [this](Node*, float value) slider->on_value_changed = [this](Node*, float value)
@@ -601,7 +601,6 @@ void App::initLayout()
} }
}; };
} }
*/
}; };
LOG("initializing layout xml"); LOG("initializing layout xml");
if (layout.m_loaded) if (layout.m_loaded)

3
engine/main.cpp
View File

@@ -432,6 +432,9 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
static POINT lastPoint; static POINT lastPoint;
switch (msg) switch (msg)
{ {
case WM_PAINT:
App::I.redraw = true;
break;
case WM_CREATE: case WM_CREATE:
BT_SetTerminate(); BT_SetTerminate();
break; break;