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

Timeline: ask for moving state to check if the user is drag-and-dropping cels

Browse Source
This commit is contained in:
David Capello 2013-12-23 00:04:38 -03:00
parent 6695d15c88
commit 02cb132aa3
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/ui/timeline.cpp
View File

@ -692,13 +692,7 @@ bool Timeline::onProcessMessage(Message* msg)
}
break;
case A_PART_CEL: {
bool movement =
m_clk_part == A_PART_CEL &&
m_hot_part == A_PART_CEL &&
(m_clk_layer != m_hot_layer ||
m_clk_frame != m_hot_frame);
if (movement) {
if (m_state == STATE_MOVING_CEL) {
set_frame_to_handle
(// Source cel.
m_layers[m_clk_layer],
@ -710,8 +704,10 @@ bool Timeline::onProcessMessage(Message* msg)
// Show the cel pop-up menu.
if (mouseMsg->right()) {
Menu* popup_menu = movement ? AppMenus::instance()->getCelMovementPopupMenu():
Menu* popup_menu = (m_state == STATE_MOVING_CEL) ?
AppMenus::instance()->getCelMovementPopupMenu():
AppMenus::instance()->getCelPopupMenu();
if (popup_menu != NULL) {
gfx::Point mousePos = mouseMsg->position();
popup_menu->showPopup(mousePos.x, mousePos.y);
@ -722,13 +718,12 @@ bool Timeline::onProcessMessage(Message* msg)
}
// Move the cel.
else if (mouseMsg->left()) {
if (movement) {
if (m_state == STATE_MOVING_CEL) {
{
const ContextReader reader(m_context);
ContextWriter writer(reader);
move_cel(writer);
}
regenerateLayers();
invalidate();
}