mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-02-20 18:40:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename "Put Alpha" to "Set Alpha"

Browse Source
This commit is contained in:
David Capello 2014-05-04 22:20:33 -03:00
parent ce7bb1b9dc
commit cd4e3aa122
8 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/settings/ink_type.h
View File

@ -29,7 +29,7 @@ namespace app {
enum InkType {
kDefaultInk,
kOpaqueInk,
kPutAlphaInk,
kSetAlphaInk,
kLockAlphaInk,
kMergeInk,
kShadingInk,

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

@ -606,7 +606,7 @@ public:
// Reset invalid configurations for inks.
if (m_inkType != kDefaultInk &&
m_inkType != kPutAlphaInk &&
m_inkType != kSetAlphaInk &&
m_inkType != kLockAlphaInk)
m_inkType = kDefaultInk;

16
src/app/tools/ink_processing.h
View File

@ -131,13 +131,13 @@ private:
};
//////////////////////////////////////////////////////////////////////
// PutAlpha Ink
// SetAlpha Ink
//////////////////////////////////////////////////////////////////////
template<typename ImageTraits>
class PutAlphaInkProcessing : public SimpleInkProcessing<PutAlphaInkProcessing<ImageTraits>, ImageTraits> {
class SetAlphaInkProcessing : public SimpleInkProcessing<SetAlphaInkProcessing<ImageTraits>, ImageTraits> {
public:
PutAlphaInkProcessing(ToolLoop* loop) {
SetAlphaInkProcessing(ToolLoop* loop) {
m_color = loop->getPrimaryColor();
m_opacity = loop->getOpacity();
}
@ -152,7 +152,7 @@ private:
};
template<>
void PutAlphaInkProcessing<RgbTraits>::processPixel(int x, int y) {
void SetAlphaInkProcessing<RgbTraits>::processPixel(int x, int y) {
*m_dstAddress = rgba(rgba_getr(m_color),
rgba_getg(m_color),
rgba_getb(m_color),
@ -160,12 +160,12 @@ void PutAlphaInkProcessing<RgbTraits>::processPixel(int x, int y) {
}
template<>
void PutAlphaInkProcessing<GrayscaleTraits>::processPixel(int x, int y) {
void SetAlphaInkProcessing<GrayscaleTraits>::processPixel(int x, int y) {
*m_dstAddress = graya(graya_getv(m_color), m_opacity);
}
template<>
void PutAlphaInkProcessing<IndexedTraits>::processPixel(int x, int y) {
void SetAlphaInkProcessing<IndexedTraits>::processPixel(int x, int y) {
*m_dstAddress = m_color;
}
@ -652,7 +652,7 @@ private:
enum {
INK_OPAQUE,
INK_PUTALPHA,
INK_SETALPHA,
INK_LOCKALPHA,
INK_TRANSPARENT,
INK_BLUR,
@ -678,7 +678,7 @@ AlgoHLine ink_processing[][3] =
ink_processing_algo<name<IndexedTraits> > }
DEFINE_INK(OpaqueInkProcessing),
DEFINE_INK(PutAlphaInkProcessing),
DEFINE_INK(SetAlphaInkProcessing),
DEFINE_INK(LockAlphaInkProcessing),
DEFINE_INK(TransparentInkProcessing),
DEFINE_INK(BlurInkProcessing),

6
src/app/tools/inks.h
View File

@ -35,7 +35,7 @@ namespace tools {
// (or foreground/background colors)
class PaintInk : public Ink {
public:
enum Type { Merge, WithFg, WithBg, Opaque, PutAlpha, LockAlpha };
enum Type { Merge, WithFg, WithBg, Opaque, SetAlpha, LockAlpha };
private:
AlgoHLine m_proc;
@ -73,8 +73,8 @@ public:
case Opaque:
m_proc = ink_processing[INK_OPAQUE][depth];
break;
case PutAlpha:
m_proc = ink_processing[INK_PUTALPHA][depth];
case SetAlpha:
m_proc = ink_processing[INK_SETALPHA][depth];
break;
case LockAlpha:
m_proc = ink_processing[INK_LOCKALPHA][depth];

4
src/app/tools/tool_box.cpp
View File

@ -57,7 +57,7 @@ const char* WellKnownInks::Paint = "paint";
const char* WellKnownInks::PaintFg = "paint_fg";
const char* WellKnownInks::PaintBg = "paint_bg";
const char* WellKnownInks::PaintOpaque = "paint_opaque";
const char* WellKnownInks::PaintPutAlpha = "paint_put_alpha";
const char* WellKnownInks::PaintSetAlpha = "paint_set_alpha";
const char* WellKnownInks::PaintLockAlpha = "paint_lock_alpha";
const char* WellKnownInks::Shading = "shading";
const char* WellKnownInks::Eraser = "eraser";
@ -87,7 +87,7 @@ ToolBox::ToolBox()
m_inks[WellKnownInks::PaintFg] = new PaintInk(PaintInk::WithFg);
m_inks[WellKnownInks::PaintBg] = new PaintInk(PaintInk::WithBg);
m_inks[WellKnownInks::PaintOpaque] = new PaintInk(PaintInk::Opaque);
m_inks[WellKnownInks::PaintPutAlpha] = new PaintInk(PaintInk::PutAlpha);
m_inks[WellKnownInks::PaintSetAlpha] = new PaintInk(PaintInk::SetAlpha);
m_inks[WellKnownInks::PaintLockAlpha] = new PaintInk(PaintInk::LockAlpha);
m_inks[WellKnownInks::Shading] = new ShadingInk();
m_inks[WellKnownInks::Eraser] = new EraserInk(EraserInk::Eraser);

2
src/app/tools/tool_box.h
View File

@ -41,7 +41,7 @@ namespace app {
extern const char* PaintFg;
extern const char* PaintBg;
extern const char* PaintOpaque;
extern const char* PaintPutAlpha;
extern const char* PaintSetAlpha;
extern const char* PaintLockAlpha;
extern const char* Shading;
extern const char* Eraser;

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

@ -272,7 +272,7 @@ public:
#if 0
addItem("Opaque");
#endif
addItem("Put Alpha");
addItem("Set Alpha");
addItem("Lock Alpha");
#if 0
addItem("Merge");
@ -290,7 +290,7 @@ public:
switch (inkType) {
case kDefaultInk: index = 0; break;
case kPutAlphaInk: index = 1; break;
case kSetAlphaInk: index = 1; break;
case kLockAlphaInk: index = 2; break;
}
@ -310,7 +310,7 @@ protected:
switch (getSelectedItemIndex()) {
case 0: inkType = kDefaultInk; break;
case 1: inkType = kPutAlphaInk; break;
case 1: inkType = kSetAlphaInk; break;
case 2: inkType = kLockAlphaInk; break;
}

4
src/app/ui/editor/tool_loop_impl.cpp
View File

@ -294,8 +294,8 @@ private:
case kOpaqueInk:
id = WellKnownInks::PaintOpaque;
break;
case kPutAlphaInk:
id = WellKnownInks::PaintPutAlpha;
case kSetAlphaInk:
id = WellKnownInks::PaintSetAlpha;
break;
case kLockAlphaInk:
id = WellKnownInks::PaintLockAlpha;