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

Add Brush::kMax/MinBrushSize constants

Browse Source
This commit is contained in:
David Capello 2014-12-07 20:50:26 -03:00
parent 6f528f3cf2
commit 07c7756638
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/commands/cmd_change_brush.cpp
View File

@ -28,6 +28,7 @@
#include "app/context.h"
#include "app/settings/settings.h"
#include "app/tools/tool.h"
#include "doc/brush.h"
namespace app {
@ -79,11 +80,11 @@ void ChangeBrushCommand::onExecute(Context* context)
// Do nothing
break;
case IncrementSize:
if (brush->getSize() < 32)
if (brush->getSize() < doc::Brush::kMaxBrushSize)
brush->setSize(brush->getSize()+1);
break;
case DecrementSize:
if (brush->getSize() > 1)
if (brush->getSize() > doc::Brush::kMinBrushSize)
brush->setSize(brush->getSize()-1);
break;
case IncrementAngle:

3
src/app/settings/ui_settings_impl.cpp
View File

@ -36,6 +36,7 @@
#include "app/ui/color_bar.h"
#include "app/ui_context.h"
#include "base/observable.h"
#include "doc/brush.h"
#include "doc/context.h"
#include "doc/documents_observer.h"
#include "ui/manager.h"
@ -880,7 +881,7 @@ public:
App::instance()->BrushSizeBeforeChange();
// Change the size of the brushcil
m_size = MID(1, size, 32);
m_size = MID(doc::Brush::kMinBrushSize, size, doc::Brush::kMaxBrushSize);
// Trigger BrushSizeAfterChange signal
if (m_fireSignals)

2
src/app/ui/context_bar.cpp
View File

@ -180,7 +180,7 @@ private:
class ContextBar::BrushSizeField : public IntEntry
{
public:
BrushSizeField() : IntEntry(1, 32) {
BrushSizeField() : IntEntry(Brush::kMinBrushSize, Brush::kMaxBrushSize) {
setSuffix("px");
}

3
src/doc/brush.h
View File

@ -23,6 +23,9 @@ namespace doc {
class Brush {
public:
static const int kMinBrushSize = 1;
static const int kMaxBrushSize = 32;
Brush();
Brush(BrushType type, int size, int angle);
Brush(const Brush& brush);