mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-02-06 03:39:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove Editor's decorators (they were never used).

Browse Source
This commit is contained in:
David Capello 2011-04-01 22:11:07 -03:00
parent f3b3664148
commit 4e567d72c7
2 changed files with 2 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
src/widgets/editor/editor.cpp
View File

@ -127,9 +127,6 @@ Editor::~Editor()
// Destroy tool-loop manager if it is created
delete m_toolLoopManager;
// Destroy all decorators
deleteDecorators();
// Remove this editor as listener of CurrentToolChange signal.
App::instance()->CurrentToolChange.disconnect(m_currentToolChangeSlot);
delete m_currentToolChangeSlot;
@ -607,41 +604,6 @@ void Editor::setMaskColorForPixelsMovement(const Color& color)
m_pixelsMovement->setMaskColor(color_utils::color_for_image(color, imgtype));
}
void Editor::deleteDecorators()
{
for (std::vector<Decorator*>::iterator
it=m_decorators.begin(); it!=m_decorators.end(); ++it)
delete *it;
m_decorators.clear();
}
void Editor::addDecorator(Decorator* decorator)
{
m_decorators.push_back(decorator);
}
void Editor::turnOnSelectionModifiers()
{
deleteDecorators();
Mask* mask = m_document->getMask();
int x1, y1, x2, y2;
editor_to_screen(mask->x, mask->y, &x1, &y1);
editor_to_screen(mask->x+mask->w-1,
mask->y+mask->h-1, &x2, &y2);
addDecorator(new Decorator(Decorator::SELECTION_NW, Rect(x1-8, y1-8, 8, 8)));
addDecorator(new Decorator(Decorator::SELECTION_N, Rect((x1+x2)/2-4, y1-8, 8, 8)));
addDecorator(new Decorator(Decorator::SELECTION_NE, Rect(x2, y1-8, 8, 8)));
addDecorator(new Decorator(Decorator::SELECTION_E, Rect(x2, (y1+y2)/2-4, 8, 8)));
addDecorator(new Decorator(Decorator::SELECTION_SE, Rect(x2, y2, 8, 8)));
addDecorator(new Decorator(Decorator::SELECTION_S, Rect((x1+x2)/2-4, y2, 8, 8)));
addDecorator(new Decorator(Decorator::SELECTION_SW, Rect(x1-8, y2, 8, 8)));
addDecorator(new Decorator(Decorator::SELECTION_W, Rect(x1-8, (y1+y2)/2-4, 8, 8)));
}
/**
Control scroll when cursor goes out of the editor
@ -953,12 +915,6 @@ bool Editor::onProcessMessage(JMessage msg)
jmanager_stop_timer(m_mask_timer_id);
}
// Draw decorators
for (std::vector<Decorator*>::iterator
it=m_decorators.begin(); it!=m_decorators.end(); ++it) {
(*it)->drawDecorator(this, ji_screen);
}
if (old_cursor_thick != 0) {
editor_draw_cursor(jmouse_x(0), jmouse_y(0));
}
@ -1607,10 +1563,8 @@ void Editor::editor_setcursor(int x, int y)
else
jmouse_set_cursor(JI_CURSOR_MOVE);
if (!m_insideSelection) {
if (!m_insideSelection)
m_insideSelection = true;
//turnOnSelectionModifiers();
}
return;
}
}
@ -1631,10 +1585,8 @@ void Editor::editor_setcursor(int x, int y)
}
}
if (m_insideSelection) {
if (m_insideSelection)
m_insideSelection = false;
//deleteDecorators();
}
// Draw
if (m_cursor_candraw) {
@ -1709,37 +1661,6 @@ void Editor::editor_set_zoom_and_center_in_mouse(int zoom, int mouse_x, int mous
show_drawing_cursor();
}
//////////////////////////////////////////////////////////////////////
// Decorator implementation
Editor::Decorator::Decorator(Type type, const Rect& bounds)
{
m_type = type;
m_bounds = bounds;
}
Editor::Decorator::~Decorator()
{
}
void Editor::Decorator::drawDecorator(Editor* editor, BITMAP* bmp)
{
rect(bmp,
m_bounds.x, m_bounds.y,
m_bounds.x+m_bounds.w-1,
m_bounds.y+m_bounds.h-1, makecol(255, 255, 255));
rectfill(bmp,
m_bounds.x+1, m_bounds.y+1,
m_bounds.x+m_bounds.w-2, m_bounds.y+m_bounds.h-2,
makecol(0, 0, 0));
}
bool Editor::Decorator::isInsideDecorator(int x, int y)
{
return (m_bounds.contains(Point(x, y)));
}
//////////////////////////////////////////////////////////////////////
// IToolLoop implementation

34
src/widgets/editor/editor.h
View File

@ -40,34 +40,6 @@ class View;
class Editor : public Widget
{
// Editor's decorators. These are useful to add some extra-graphics
// visualizators in the editor to show feedback and get user events (click)
class Decorator
{
public:
enum Type {
SELECTION_NW,
SELECTION_N,
SELECTION_NE,
SELECTION_E,
SELECTION_SE,
SELECTION_S,
SELECTION_SW,
SELECTION_W,
};
private:
Type m_type;
gfx::Rect m_bounds;
public:
Decorator(Type type, const gfx::Rect& bounds);
~Decorator();
void drawDecorator(Editor*editor, BITMAP* bmp);
bool isInsideDecorator(int x, int y);
Signal0<void> Click;
};
// editor states
enum State {
EDITOR_STATE_STANDBY,
@ -110,9 +82,6 @@ class Editor : public Widget
// Tool-loop manager
ToolLoopManager* m_toolLoopManager;
// Decorators
std::vector<Decorator*> m_decorators;
// Helper member to move selection. If this member is NULL it means the
// user is not moving pixels.
PixelsMovement* m_pixelsMovement;
@ -212,9 +181,6 @@ protected:
private:
void drawGrid(const gfx::Rect& gridBounds, const Color& color);
void addDecorator(Decorator* decorator);
void deleteDecorators();
void turnOnSelectionModifiers();
void controlInfiniteScroll(JMessage msg);
void dropPixels();