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

Remove tool configuration from ConfigureTools command (it's in ContextBar now)

Browse Source
This commit is contained in:
David Capello 2013-03-30 21:46:35 -03:00
parent db193a07a2
commit ce6b186e1b
2 changed files with 0 additions and 328 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
data/widgets/tools_configuration.xml
View File

@ -17,43 +17,6 @@
<check text="Pixel Grid" id="pixel_grid" />
<button text="Set &amp;Grid" id="set_grid" />
</box>
<separator vertical="true" />
<box vertical="true" expansive="true" childspacing="2">
<box horizontal="true">
<grid columns="2" childspacing="0" expansive="true">
<label text="Pen:" />
<box horizontal="true" childspacing="0" id="brush_type_box" /><!-- custom widget -->
<label text="Size:" />
<slider min="1" max="32" id="brush_size" minwidth="32" cell_align="horizontal" />
<label text="Angle:" />
<slider min="0" max="180" id="brush_angle" cell_align="horizontal" />
<label text="Opacity:" id="opacity_label" />
<slider min="0" max="255" id="opacity" cell_align="horizontal" />
<label text="Tolerance:" id="tolerance_label" />
<slider min="0" max="255" id="tolerance" cell_align="horizontal" />
</grid>
<box id="brush_preview_box" /><!-- custom widget -->
</box>
<box vertical="true" id="spray_box">
<separator text="Spray:" horizontal="true" left="true" />
<box horizontal="true">
<box vertical="true" homogeneous="true" childspacing="0">
<label text="Spray Width:" />
<label text="Air Speed:" />
</box>
<box vertical="true" homogeneous="true" expansive="true" childspacing="0">
<slider min="1" max="32" id="spray_width" />
<slider min="1" max="100" id="air_speed" />
</box>
</box>
</box>
</box>
</box>
</box>
</window>

291
src/commands/cmd_configure_tools.cpp
View File

@ -27,22 +27,13 @@
#include "console.h"
#include "context_access.h"
#include "gfx/size.h"
#include "modules/editors.h"
#include "modules/gfx.h"
#include "modules/gui.h"
#include "raster/image.h"
#include "raster/mask.h"
#include "raster/pen.h"
#include "raster/sprite.h"
#include "settings/document_settings.h"
#include "settings/settings.h"
#include "skin/skin_parts.h"
#include "tools/ink.h"
#include "tools/point_shape.h"
#include "tools/tool.h"
#include "ui/gui.h"
#include "ui_context.h"
#include "widgets/button_set.h"
#include "widgets/color_button.h"
#include "widgets/editor/editor.h"
#include "widgets/status_bar.h"
@ -57,51 +48,6 @@ static Window* window = NULL;
static bool window_close_hook(Widget* widget, void *data);
class BrushPreview : public Widget
{
public:
BrushPreview() : Widget(JI_WIDGET) {
}
protected:
bool onProcessMessage(Message* msg)
{
switch (msg->type) {
case JM_DRAW: {
BITMAP *bmp = create_bitmap(jrect_w(this->rc),
jrect_h(this->rc));
Tool* current_tool = UIContext::instance()
->getSettings()
->getCurrentTool();
IPenSettings* pen_settings = UIContext::instance()
->getSettings()
->getToolSettings(current_tool)
->getPen();
ASSERT(pen_settings != NULL);
UniquePtr<Pen> pen(new Pen(pen_settings->getType(),
pen_settings->getSize(),
pen_settings->getAngle()));
clear_to_color(bmp, makecol(0, 0, 0));
image_to_allegro(pen->get_image(), bmp,
bmp->w/2 - pen->get_size()/2,
bmp->h/2 - pen->get_size()/2, NULL);
blit(bmp, ji_screen, 0, 0, this->rc->x1, this->rc->y1,
bmp->w, bmp->h);
destroy_bitmap(bmp);
return true;
}
}
return Widget::onProcessMessage(msg);
}
};
// Slot for App::Exit signal
static void on_exit_delete_this_widget()
{
@ -109,106 +55,6 @@ static void on_exit_delete_this_widget()
delete window;
}
static void on_pen_size_after_change()
{
Slider* brush_size = window->findChildT<Slider>("brush_size");
BrushPreview* brushPreview = window->findChildT<BrushPreview>("brush_preview");
ASSERT(brush_size != NULL);
Tool* current_tool = UIContext::instance()
->getSettings()
->getCurrentTool();
IToolSettings* tool_settings = UIContext::instance()
->getSettings()
->getToolSettings(current_tool);
brush_size->setValue(tool_settings->getPen()->getSize());
// Regenerate the preview
brushPreview->invalidate();
}
static void on_current_tool_change()
{
Slider* brush_size = window->findChildT<Slider>("brush_size");
Slider* brush_angle = window->findChildT<Slider>("brush_angle");
ButtonSet* brush_type = window->findChildT<ButtonSet>("brush_type");
BrushPreview* brushPreview = window->findChildT<BrushPreview>("brush_preview");
Widget* opacity_label = window->findChild("opacity_label");
Slider* opacity = window->findChildT<Slider>("opacity");
Widget* tolerance_label = window->findChild("tolerance_label");
Slider* tolerance = window->findChildT<Slider>("tolerance");
Widget* spray_box = window->findChild("spray_box");
Slider* spray_width = window->findChildT<Slider>("spray_width");
Slider* air_speed = window->findChildT<Slider>("air_speed");
Tool* current_tool = UIContext::instance()
->getSettings()
->getCurrentTool();
IToolSettings* tool_settings = UIContext::instance()
->getSettings()
->getToolSettings(current_tool);
opacity->setValue(tool_settings->getOpacity());
tolerance->setValue(tool_settings->getTolerance());
brush_size->setValue(tool_settings->getPen()->getSize());
brush_angle->setValue(tool_settings->getPen()->getAngle());
spray_width->setValue(tool_settings->getSprayWidth());
air_speed->setValue(tool_settings->getSpraySpeed());
// Select the brush type
brush_type->setSelectedItem(tool_settings->getPen()->getType());
// Regenerate the preview
brushPreview->invalidate();
// True if the current tool needs opacity options
bool hasOpacity = (current_tool->getInk(0)->isPaint() ||
current_tool->getInk(0)->isEffect() ||
current_tool->getInk(1)->isPaint() ||
current_tool->getInk(1)->isEffect());
// True if the current tool needs tolerance options
bool hasTolerance = (current_tool->getPointShape(0)->isFloodFill() ||
current_tool->getPointShape(1)->isFloodFill());
// True if the current tool needs spray options
bool hasSprayOptions = (current_tool->getPointShape(0)->isSpray() ||
current_tool->getPointShape(1)->isSpray());
// Show/Hide parameters
opacity_label->setVisible(hasOpacity);
opacity->setVisible(hasOpacity);
tolerance_label->setVisible(hasTolerance);
tolerance->setVisible(hasTolerance);
spray_box->setVisible(hasSprayOptions);
// Get the required size of the whole window
Size reqSize = window->getPreferredSize();
if (jrect_w(window->rc) < reqSize.w ||
jrect_h(window->rc) != reqSize.h) {
JRect rect = jrect_new(window->rc->x1, window->rc->y1,
(jrect_w(window->rc) < reqSize.w) ? window->rc->x1 + reqSize.w:
window->rc->x2,
window->rc->y1 + reqSize.h);
// Show the expanded area inside the screen
if (rect->y2 > JI_SCREEN_H)
jrect_displace(rect, 0, JI_SCREEN_H - rect->y2);
window->moveWindow(rect);
jrect_free(rect);
}
else
window->setBounds(window->getBounds()); // TODO layout() method is missing
// Redraw the window
window->invalidate();
}
//////////////////////////////////////////////////////////////////////
class ConfigureTools : public Command
@ -228,14 +74,6 @@ private:
CheckBox* m_snapToGrid;
CheckBox* m_onionSkin;
CheckBox* m_viewGrid;
Widget* m_brushPreview;
ButtonSet* m_brushType;
Slider* m_brushSize;
Slider* m_brushAngle;
Slider* m_opacity;
Slider* m_tolerance;
Slider* m_sprayWidth;
Slider* m_airSpeed;
ISettings* m_settings;
IDocumentSettings* m_docSettings;
@ -247,14 +85,6 @@ private:
void onSetGridClick();
void onSnapToGridClick();
void onOnionSkinClick();
void onBrushSizeSliderChange();
void onBrushAngleSliderChange();
void onOpacitySliderChange();
void onToleranceSliderChange();
void onSprayWidthSliderChange();
void onAirSpeedSliderChange();
void onBrushTypeChange();
};
ConfigureTools::ConfigureTools()
@ -272,8 +102,6 @@ void ConfigureTools::onExecute(Context* context)
m_docSettings = m_settings->getDocumentSettings(NULL);
Button* set_grid;
Widget* brush_preview_box;
Widget* brush_type_box;
bool first_time = false;
if (!window) {
@ -294,14 +122,6 @@ void ConfigureTools::onExecute(Context* context)
m_viewGrid = app::find_widget<CheckBox>(window, "view_grid");
m_pixelGrid = app::find_widget<CheckBox>(window, "pixel_grid");
set_grid = app::find_widget<Button>(window, "set_grid");
m_brushSize = app::find_widget<Slider>(window, "brush_size");
m_brushAngle = app::find_widget<Slider>(window, "brush_angle");
m_opacity = app::find_widget<Slider>(window, "opacity");
m_tolerance = app::find_widget<Slider>(window, "tolerance");
m_sprayWidth = app::find_widget<Slider>(window, "spray_width");
m_airSpeed = app::find_widget<Slider>(window, "air_speed");
brush_preview_box = app::find_widget<Widget>(window, "brush_preview_box");
brush_type_box = app::find_widget<Widget>(window, "brush_type_box");
m_onionSkin = app::find_widget<CheckBox>(window, "onionskin");
}
catch (...) {
@ -310,36 +130,10 @@ void ConfigureTools::onExecute(Context* context)
throw;
}
/* brush-preview */
if (first_time) {
m_brushPreview = new BrushPreview();
m_brushPreview->min_w = 32 + 4;
m_brushPreview->min_h = 32 + 4;
m_brushPreview->setId("brush_preview");
}
else {
m_brushPreview = window->findChild("brush_preview");
}
// Current settings
Tool* current_tool = m_settings->getCurrentTool();
IToolSettings* tool_settings = m_settings->getToolSettings(current_tool);
/* brush-type */
if (first_time) {
PenType type = tool_settings->getPen()->getType();
m_brushType = new ButtonSet(3, 1, type,
PART_BRUSH_CIRCLE,
PART_BRUSH_SQUARE,
PART_BRUSH_LINE);
m_brushType->setId("brush_type");
}
else {
m_brushType = window->findChildT<ButtonSet>("brush_type");
}
if (m_docSettings->getTiledMode() != TILED_NONE) {
m_tiled->setSelected(true);
if (m_docSettings->getTiledMode() & TILED_X_AXIS) m_tiledX->setSelected(true);
@ -352,10 +146,6 @@ void ConfigureTools::onExecute(Context* context)
if (m_docSettings->getUseOnionskin()) m_onionSkin->setSelected(true);
if (first_time) {
// Append children
brush_preview_box->addChild(m_brushPreview);
brush_type_box->addChild(m_brushType);
// Slots
window->Close.connect(Bind<void>(&ConfigureTools::onWindowClose, this));
m_tiled->Click.connect(Bind<void>(&ConfigureTools::onTiledClick, this));
@ -368,22 +158,8 @@ void ConfigureTools::onExecute(Context* context)
m_onionSkin->Click.connect(Bind<void>(&ConfigureTools::onOnionSkinClick, this));
App::instance()->Exit.connect(&on_exit_delete_this_widget);
App::instance()->PenSizeAfterChange.connect(&on_pen_size_after_change);
App::instance()->CurrentToolChange.connect(&on_current_tool_change);
// Append hooks
m_brushSize->Change.connect(Bind<void>(&ConfigureTools::onBrushSizeSliderChange, this));
m_brushAngle->Change.connect(Bind<void>(&ConfigureTools::onBrushAngleSliderChange, this));
m_opacity->Change.connect(&ConfigureTools::onOpacitySliderChange, this);
m_tolerance->Change.connect(&ConfigureTools::onToleranceSliderChange, this);
m_airSpeed->Change.connect(&ConfigureTools::onAirSpeedSliderChange, this);
m_sprayWidth->Change.connect(&ConfigureTools::onSprayWidthSliderChange, this);
m_brushType->ItemChange.connect(&ConfigureTools::onBrushTypeChange, this);
}
// Update current pen properties
on_current_tool_change();
// Default position
window->remapWindow();
window->centerWindow();
@ -399,73 +175,6 @@ void ConfigureTools::onWindowClose()
save_window_pos(window, "ConfigureTool");
}
void ConfigureTools::onBrushTypeChange()
{
PenType type = (PenType)m_brushType->getSelectedItem();
Tool* current_tool = m_settings->getCurrentTool();
m_settings->getToolSettings(current_tool)
->getPen()
->setType(type);
m_brushPreview->invalidate();
StatusBar::instance()
->setStatusText(250,
"Pen shape: %s",
type == PEN_TYPE_CIRCLE ? "Circle":
type == PEN_TYPE_SQUARE ? "Square":
type == PEN_TYPE_LINE ? "Line": "Unknown");
}
void ConfigureTools::onBrushSizeSliderChange()
{
Tool* current_tool = m_settings->getCurrentTool();
m_settings->getToolSettings(current_tool)
->getPen()
->setSize(m_brushSize->getValue());
m_brushPreview->invalidate();
}
void ConfigureTools::onBrushAngleSliderChange()
{
Tool* current_tool = m_settings->getCurrentTool();
m_settings->getToolSettings(current_tool)
->getPen()
->setAngle(m_brushAngle->getValue());
m_brushPreview->invalidate();
}
void ConfigureTools::onOpacitySliderChange()
{
Tool* current_tool = m_settings->getCurrentTool();
m_settings->getToolSettings(current_tool)->setOpacity(m_opacity->getValue());
}
void ConfigureTools::onToleranceSliderChange()
{
Tool* current_tool = m_settings->getCurrentTool();
m_settings->getToolSettings(current_tool)->setTolerance(m_tolerance->getValue());
}
void ConfigureTools::onSprayWidthSliderChange()
{
Tool* current_tool = m_settings->getCurrentTool();
m_settings->getToolSettings(current_tool)->setSprayWidth(m_sprayWidth->getValue());
}
void ConfigureTools::onAirSpeedSliderChange()
{
Tool* current_tool = m_settings->getCurrentTool();
m_settings->getToolSettings(current_tool)->setSpraySpeed(m_airSpeed->getValue());
}
void ConfigureTools::onTiledClick()
{
bool flag = m_tiled->isSelected();