mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-14 04:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #924 from TheKK/brush_value_set

Browse Source 
Apply brush size when clicking on brush icon
This commit is contained in:
David Capello 2016-04-25 14:04:06 -03:00
commit 34d4489599
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/app/ui/brush_popup.cpp
View File

@ -18,6 +18,7 @@
#include "app/modules/gui.h"
#include "app/modules/palettes.h"
#include "app/pref/preferences.h"
#include "app/tools/tool.h"
#include "app/ui/app_menuitem.h"
#include "app/ui/button_set.h"
#include "app/ui/context_bar.h"
@ -94,8 +95,19 @@ private:
if (m_slot >= 0)
contextBar->setActiveBrushBySlot(m_slot);
else if (m_brush.hasBrush())
contextBar->setActiveBrush(m_brush.brush());
else if (m_brush.hasBrush()) {
tools::Tool* tool = App::instance()->activeTool();
auto& brushPref = Preferences::instance().tool(tool).brush;
BrushRef brush;
brush.reset(
new Brush(
static_cast<doc::BrushType>(m_brush.brush()->type()),
brushPref.size(),
brushPref.angle()));
contextBar->setActiveBrush(brush);
}
}
AppBrushes& m_brushes;