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

test floating some panels

Browse Source
This commit is contained in:
omigamedev
2019-03-24 01:43:13 +01:00
parent 929e80a218
commit a50654d8b7
7 changed files with 57 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/app_layout.cpp
View File

@@ -5,6 +5,7 @@
#include "node_text.h"
#include "node_progress_bar.h"
#include "node_dialog_picker.h"
#include "node_panel_floating.h"
void App::title_update()
{
@@ -872,6 +873,10 @@ void App::brush_update()
*quick->m_button_brush_current_preview->m_brush = *Canvas::I->m_current_brush;
quick->m_button_brush_current_preview->draw_stroke();
quick->m_button_color_current_inner->m_color = Canvas::I->m_current_brush->m_tip_color;
if (floating_picker)
floating_picker->set_color(Canvas::I->m_current_brush->m_tip_color);
if (floating_color)
floating_color->set_color(Canvas::I->m_current_brush->m_tip_color);
}
void App::init_menu_layer()
@@ -1080,8 +1085,41 @@ void App::initLayout()
};
}
// test floating panel
auto fp_presets = layout[main_id]->add_child<NodePanelFloating>();
floating_presets = fp_presets->m_container->add_child<NodePanelBrushPreset>();
floating_presets->SetHeightP(100);
floating_presets->on_brush_changed = [this](Node* target, std::shared_ptr<Brush>& b) {
auto c = Canvas::I->m_current_brush->m_tip_color;
*Canvas::I->m_current_brush = *b;
Canvas::I->m_current_brush->m_tip_color = c;
Canvas::I->m_current_brush->load();
brush_update();
};
auto fp_color = layout[main_id]->add_child<NodePanelFloating>();
floating_color = fp_color->m_container->add_child<NodePanelColor>();
floating_color->SetHeightP(100);
floating_color->find("title")->destroy();
floating_color->on_color_changed = [this](Node* target, glm::vec4 color) {
Canvas::I->m_current_brush->m_tip_color = color;
brush_update();
};
auto fp_picker = layout[main_id]->add_child<NodePanelFloating>();
fp_picker->m_container->SetSize(300, 500);
floating_picker = fp_picker->m_container->add_child<NodeColorPicker>();
floating_picker->m_autohide = false;
floating_picker->on_color_change = [this](Node* target, glm::vec3 color) {
Canvas::I->m_current_brush->m_tip_color = glm::vec4(color, 1.f);
brush_update();
};
//picker->SetHeightP(100);
//color->find("title")->destroy();
App::I.redraw = true;
};
LOG("initializing layout xml");
if (layout.m_loaded)
{