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

integrate quick brushes, simulate pressed keys on windows active

Browse Source
This commit is contained in:
omigamedev
2019-03-05 23:41:43 +01:00
parent 1cbe9a4a76
commit b0933c29fb
8 changed files with 79 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/canvas_modes.cpp
View File

@@ -265,16 +265,14 @@ void CanvasModePen::leave()
void CanvasModePen::enter(kCanvasMode prev)
{
m_cur_pos = Canvas::I->m_cur_pos;
if (m_brush)
{
*Canvas::I->m_current_brush = *m_brush;
Canvas::I->m_current_brush->load();
App::I.brush_update();
}
else
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();
}
////////////////////////////////////////////////////////////////////
@@ -337,6 +335,23 @@ void CanvasModeLine::init()
m_line.create();
}
void CanvasModeLine::enter(kCanvasMode prev)
{
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()
{
*m_brush = *Canvas::I->m_current_brush;
}
////////////////////////////////////////////////////////////////////
void CanvasModeCamera::on_MouseEvent(MouseEvent* me, glm::vec2& loc)