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

Spray settings are hidden when we do not have the Spray tool selected.

Browse Source
This commit is contained in:
David Capello 2010-08-13 11:04:17 -03:00
parent 52db5a6bb3
commit 78366fa545
2 changed files with 45 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
data/widgets/tools_configuration.xml
View File

@ -40,15 +40,17 @@
</grid> </grid>
<box name="brush_preview_box" /><!-- custom widget --> <box name="brush_preview_box" /><!-- custom widget -->
</box> </box>
<separator text="Spray:" horizontal="true" left="true" /> <box vertical="true" name="spray_box">
<box horizontal="true"> <separator text="Spray:" horizontal="true" left="true" />
<box vertical="true" homogeneous="true" childspacing="0"> <box horizontal="true">
<label text="Spray Width:" /> <box vertical="true" homogeneous="true" childspacing="0">
<label text="Air Speed:" /> <label text="Spray Width:" />
</box> <label text="Air Speed:" />
<box vertical="true" homogeneous="true" expansive="true" childspacing="0"> </box>
<slider min="1" max="32" name="spray_width" /> <box vertical="true" homogeneous="true" expansive="true" childspacing="0">
<slider min="1" max="100" name="air_speed" /> <slider min="1" max="32" name="spray_width" />
<slider min="1" max="100" name="air_speed" />
</box>
</box> </box>
</box> </box>
</box> </box>

34
src/commands/cmd_configure_tools.cpp
View File

@ -22,6 +22,7 @@
#include "jinete/jinete.h" #include "jinete/jinete.h"
#include "Vaca/Bind.h" #include "Vaca/Bind.h"
#include "Vaca/Size.h"
#include "app.h" #include "app.h"
#include "commands/command.h" #include "commands/command.h"
@ -37,11 +38,14 @@
#include "settings/settings.h" #include "settings/settings.h"
#include "sprite_wrappers.h" #include "sprite_wrappers.h"
#include "ui_context.h" #include "ui_context.h"
#include "tools/tool.h"
#include "widgets/colbut.h" #include "widgets/colbut.h"
#include "widgets/editor.h" #include "widgets/editor.h"
#include "widgets/groupbut.h" #include "widgets/groupbut.h"
#include "widgets/statebar.h" #include "widgets/statebar.h"
using Vaca::Size;
static Frame* window = NULL; static Frame* window = NULL;
static bool brush_preview_msg_proc(JWidget widget, JMessage msg); static bool brush_preview_msg_proc(JWidget widget, JMessage msg);
@ -96,6 +100,7 @@ static void on_current_tool_change()
Widget* brush_preview = window->findChild("brush_preview"); Widget* brush_preview = window->findChild("brush_preview");
Widget* opacity = window->findChild("opacity"); Widget* opacity = window->findChild("opacity");
Widget* tolerance = window->findChild("tolerance"); Widget* tolerance = window->findChild("tolerance");
Widget* spray_box = window->findChild("spray_box");
Widget* spray_width = window->findChild("spray_width"); Widget* spray_width = window->findChild("spray_width");
Widget* air_speed = window->findChild("air_speed"); Widget* air_speed = window->findChild("air_speed");
@ -114,10 +119,39 @@ static void on_current_tool_change()
jslider_set_value(spray_width, tool_settings->getSprayWidth()); jslider_set_value(spray_width, tool_settings->getSprayWidth());
jslider_set_value(air_speed, tool_settings->getSpraySpeed()); jslider_set_value(air_speed, tool_settings->getSpraySpeed());
// Select the brush type
group_button_select(brush_type, tool_settings->getPen()->getType()); group_button_select(brush_type, tool_settings->getPen()->getType());
// Regenerate the preview // Regenerate the preview
brush_preview->dirty(); brush_preview->dirty();
// True if the current tool needs spray options
bool hasSprayOptions = (current_tool->getPointShape(0)->isSpray() ||
current_tool->getPointShape(1)->isSpray());
// Show/Hide spray settings
spray_box->setVisible(hasSprayOptions);
// Get the required size of the whole window
Size reqSize = window->getPreferredSize();
// Set the window height
if (jrect_h(window->rc) != reqSize.h) {
JRect rect = jrect_new(window->rc->x1, window->rc->y1,
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->move_window(rect);
jrect_free(rect);
}
else
window->setBounds(window->getBounds()); // TODO layout() method is missing
// Redraw the window
window->dirty();
} }
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////