mirror of
https://github.com/aseprite/aseprite.git
synced 2025-04-10 03:44:16 +00:00
Renamed file cmd_eyedropper_tool.cpp to cmd_eyedropper.cpp
This commit is contained in:
parent
7454b7c03d
commit
9e5d0dc2f2
@ -24,7 +24,7 @@ COMMON_SOURCES = \
|
|||||||
src/commands/cmd_duplicate_layer.cpp \
|
src/commands/cmd_duplicate_layer.cpp \
|
||||||
src/commands/cmd_duplicate_sprite.cpp \
|
src/commands/cmd_duplicate_sprite.cpp \
|
||||||
src/commands/cmd_exit.cpp \
|
src/commands/cmd_exit.cpp \
|
||||||
src/commands/cmd_eyedropper_tool.cpp \
|
src/commands/cmd_eyedropper.cpp \
|
||||||
src/commands/cmd_film_editor.cpp \
|
src/commands/cmd_film_editor.cpp \
|
||||||
src/commands/cmd_flatten_layers.cpp \
|
src/commands/cmd_flatten_layers.cpp \
|
||||||
src/commands/cmd_flip.cpp \
|
src/commands/cmd_flip.cpp \
|
||||||
|
@ -32,9 +32,9 @@
|
|||||||
#include "widgets/editor.h"
|
#include "widgets/editor.h"
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////
|
||||||
// eyedropper_tool
|
// eyedropper
|
||||||
|
|
||||||
class EyedropperToolCommand : public Command
|
class EyedropperCommand : public Command
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* True means "pick background color", false the foreground color.
|
* True means "pick background color", false the foreground color.
|
||||||
@ -42,30 +42,30 @@ class EyedropperToolCommand : public Command
|
|||||||
bool m_background;
|
bool m_background;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
EyedropperToolCommand();
|
EyedropperCommand();
|
||||||
Command* clone() const { return new EyedropperToolCommand(*this); }
|
Command* clone() const { return new EyedropperCommand(*this); }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void load_params(Params* params);
|
void load_params(Params* params);
|
||||||
void execute(Context* context);
|
void execute(Context* context);
|
||||||
};
|
};
|
||||||
|
|
||||||
EyedropperToolCommand::EyedropperToolCommand()
|
EyedropperCommand::EyedropperCommand()
|
||||||
: Command("eyedropper_tool",
|
: Command("eyedropper",
|
||||||
"Eyedropper",
|
"Eyedropper",
|
||||||
CmdUIOnlyFlag)
|
CmdUIOnlyFlag)
|
||||||
{
|
{
|
||||||
m_background = false;
|
m_background = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void EyedropperToolCommand::load_params(Params* params)
|
void EyedropperCommand::load_params(Params* params)
|
||||||
{
|
{
|
||||||
std::string target = params->get("target");
|
std::string target = params->get("target");
|
||||||
if (target == "foreground") m_background = false;
|
if (target == "foreground") m_background = false;
|
||||||
else if (target == "background") m_background = true;
|
else if (target == "background") m_background = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void EyedropperToolCommand::execute(Context* context)
|
void EyedropperCommand::execute(Context* context)
|
||||||
{
|
{
|
||||||
JWidget widget;
|
JWidget widget;
|
||||||
Editor *editor;
|
Editor *editor;
|
||||||
@ -101,7 +101,7 @@ void EyedropperToolCommand::execute(Context* context)
|
|||||||
//////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////
|
||||||
// CommandFactory
|
// CommandFactory
|
||||||
|
|
||||||
Command* CommandFactory::create_eyedropper_tool_command()
|
Command* CommandFactory::create_eyedropper_command()
|
||||||
{
|
{
|
||||||
return new EyedropperToolCommand;
|
return new EyedropperCommand;
|
||||||
}
|
}
|
@ -40,7 +40,7 @@ FOR_EACH_COMMAND(despeckle)
|
|||||||
FOR_EACH_COMMAND(duplicate_layer)
|
FOR_EACH_COMMAND(duplicate_layer)
|
||||||
FOR_EACH_COMMAND(duplicate_sprite)
|
FOR_EACH_COMMAND(duplicate_sprite)
|
||||||
FOR_EACH_COMMAND(exit)
|
FOR_EACH_COMMAND(exit)
|
||||||
FOR_EACH_COMMAND(eyedropper_tool)
|
FOR_EACH_COMMAND(eyedropper)
|
||||||
FOR_EACH_COMMAND(film_editor)
|
FOR_EACH_COMMAND(film_editor)
|
||||||
FOR_EACH_COMMAND(flatten_layers)
|
FOR_EACH_COMMAND(flatten_layers)
|
||||||
FOR_EACH_COMMAND(flip)
|
FOR_EACH_COMMAND(flip)
|
||||||
|
@ -1067,7 +1067,7 @@ static bool editor_msg_proc(JWidget widget, JMessage msg)
|
|||||||
/* call the eyedropper command */
|
/* call the eyedropper command */
|
||||||
else if (editor->alt_pressed) {
|
else if (editor->alt_pressed) {
|
||||||
Command* eyedropper_cmd =
|
Command* eyedropper_cmd =
|
||||||
CommandsModule::instance()->get_command_by_name(CommandId::eyedropper_tool);
|
CommandsModule::instance()->get_command_by_name(CommandId::eyedropper);
|
||||||
|
|
||||||
Params params;
|
Params params;
|
||||||
params.set("target", msg->mouse.right ? "background": "foreground");
|
params.set("target", msg->mouse.right ? "background": "foreground");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user