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

improve quick panel switch state

Browse Source
This commit is contained in:
omigamedev
2019-05-11 19:11:24 +02:00
parent 51dcc56dd6
commit 61c331fcb1
7 changed files with 26 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/canvas_modes.cpp
View File

@@ -268,20 +268,11 @@ void CanvasModePen::on_Draw(const glm::mat4& ortho, const glm::mat4& proj, const
void CanvasModePen::leave(kCanvasMode next)
{
*m_brush = *Canvas::I->m_current_brush;
}
void CanvasModePen::enter(kCanvasMode prev)
{
m_cur_pos = Canvas::I->m_cur_pos;
if (!m_brush)
{
m_brush = std::make_shared<Brush>(*Canvas::I->m_current_brush);
m_brush->load_tip("data/brushes/Round-Hard.png", "data/brushes/thumbs/Round-Hard.png");
}
*Canvas::I->m_current_brush = *m_brush;
Canvas::I->m_current_brush->load();
App::I.brush_update();
}
////////////////////////////////////////////////////////////////////
@@ -386,19 +377,10 @@ void CanvasModeLine::init()
void CanvasModeLine::enter(kCanvasMode prev)
{
m_cur_pos = Canvas::I->m_cur_pos;
if (!m_brush)
{
m_brush = std::make_shared<Brush>();
m_brush->load_tip("data/brushes/Round-Hard.png", "data/brushes/thumbs/Round-Hard.png");
}
*Canvas::I->m_current_brush = *m_brush;
Canvas::I->m_current_brush->load();
App::I.brush_update();
}
void CanvasModeLine::leave(kCanvasMode next)
{
*m_brush = *Canvas::I->m_current_brush;
}
////////////////////////////////////////////////////////////////////