root
/
aseprite
mirror of https://github.com/aseprite/aseprite.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Rename BrushPattern::ALIGNED_FROM_SRC to ALIGNED_TO_SRC

This commit is contained in:
David Capello 2015-04-27 11:45:00 -03:00
parent d9fb81e5d1
commit 96769d061e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/pref.xml
View File

@ -99,7 +99,7 @@
<option id="new_url" type="std::string" /> <option id="new_url" type="std::string" />
</section> </section>
<section id="brush"> <section id="brush">
<option id="pattern" type="doc::BrushPattern" default="doc::BrushPattern::ALIGNED_FROM_SRC" /> <option id="pattern" type="doc::BrushPattern" default="doc::BrushPattern::DEFAULT" />
</section> </section>
</global> </global>

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

@ -224,7 +224,7 @@ class ContextBar::BrushPatternField : public ComboBox
{ {
public: public:
BrushPatternField() : m_lock(false) { BrushPatternField() : m_lock(false) {
addItem("Pattern aligned from source"); addItem("Pattern aligned to source");
addItem("Pattern aligned to destination"); addItem("Pattern aligned to destination");
addItem("Paint brush"); addItem("Paint brush");
} }
@ -233,7 +233,7 @@ public:
int index = 0; int index = 0;
switch (type) { switch (type) {
case BrushPattern::ALIGNED_FROM_SRC: index = 0; break; case BrushPattern::ALIGNED_TO_SRC: index = 0; break;
case BrushPattern::ALIGNED_TO_DST: index = 1; break; case BrushPattern::ALIGNED_TO_DST: index = 1; break;
case BrushPattern::PAINT_BRUSH: index = 2; break; case BrushPattern::PAINT_BRUSH: index = 2; break;
} }
@ -250,10 +250,10 @@ protected:
if (m_lock) if (m_lock)
return; return;
BrushPattern type = BrushPattern::ALIGNED_FROM_SRC; BrushPattern type = BrushPattern::ALIGNED_TO_SRC;
switch (getSelectedItemIndex()) { switch (getSelectedItemIndex()) {
case 0: type = BrushPattern::ALIGNED_FROM_SRC; break; case 0: type = BrushPattern::ALIGNED_TO_SRC; break;
case 1: type = BrushPattern::ALIGNED_TO_DST; break; case 1: type = BrushPattern::ALIGNED_TO_DST; break;
case 2: type = BrushPattern::PAINT_BRUSH; break; case 2: type = BrushPattern::PAINT_BRUSH; break;
} }

2
src/doc/brush_pattern.h
View File

@ -12,7 +12,7 @@ namespace doc {
enum class BrushPattern { enum class BrushPattern {
DEFAULT = 0, DEFAULT = 0,
ALIGNED_FROM_SRC = 0, ALIGNED_TO_SRC = 0,
ALIGNED_TO_DST = 1, ALIGNED_TO_DST = 1,
PAINT_BRUSH = 2, PAINT_BRUSH = 2,
}; };