mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-31 16:20:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue 341: cannot scroll Timeline with space bar

Browse Source
This commit is contained in:
David Capello 2014-02-08 17:40:26 -03:00
parent 61c5b0dbb6
commit aa9eec2cfd
2 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -195,7 +195,6 @@ void Timeline::updateUsingEditor(Editor* editor)
m_state = STATE_STANDBY;
m_hot_part = A_PART_NOTHING;
m_clk_part = A_PART_NOTHING;
m_space_pressed = false;
setFocusStop(true);
regenerateLayers();
@ -256,21 +255,13 @@ bool Timeline::onProcessMessage(Message* msg)
case kTimerMessage:
break;
case kMouseEnterMessage:
if (key[KEY_SPACE]) m_space_pressed = true;
break;
case kMouseLeaveMessage:
if (m_space_pressed) m_space_pressed = false;
break;
case kMouseDownMessage: {
MouseMessage* mouseMsg = static_cast<MouseMessage*>(msg);
if (!m_document)
break;
if (mouseMsg->middle() || m_space_pressed) {
if (mouseMsg->middle() || key[KEY_SPACE]) {
captureMouse();
m_state = STATE_SCROLLING;
return true;
@ -798,6 +789,16 @@ bool Timeline::onProcessMessage(Message* msg)
}
break;
case kKeyDownMessage:
switch (static_cast<KeyMessage*>(msg)->scancode()) {
case kKeySpace: {
setCursor(jmouse_x(0), jmouse_y(0));
return true;
}
}
break;
case kKeyUpMessage:
switch (static_cast<KeyMessage*>(msg)->scancode()) {
@ -806,16 +807,13 @@ bool Timeline::onProcessMessage(Message* msg)
invalidate();
break;
case kKeySpace:
if (m_space_pressed) {
// We have to clear all the KEY_SPACE in buffer.
clear_keybuf();
case kKeySpace: {
// We have to clear all the KEY_SPACE in buffer.
clear_keybuf();
m_space_pressed = false;
setCursor(jmouse_x(0), jmouse_y(0));
return true;
}
break;
setCursor(jmouse_x(0), jmouse_y(0));
return true;
}
}
break;
@ -1035,8 +1033,7 @@ void Timeline::setCursor(int x, int y)
//int my = y - getBounds().y;
// Scrolling.
if (m_state == STATE_SCROLLING ||
m_space_pressed) {
if (m_state == STATE_SCROLLING || key[KEY_SPACE]) {
jmouse_set_cursor(kScrollCursor);
}
// Moving a frame.

2
src/app/ui/timeline.h
View File

@ -203,8 +203,6 @@ namespace app {
int m_clk_part;
int m_clk_layer;
FrameNumber m_clk_frame;
// Keys
bool m_space_pressed;
// Old mouse position (for scrolling).
gfx::Point m_oldPos;
};