mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-11 13:14:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Timeline::showCel() now that we have an extra header (Timeline::topHeight())

Browse Source
This commit is contained in:
David Capello 2015-04-10 10:15:24 -03:00
parent 5ad65eab39
commit acf7e41621
2 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1059,11 +1059,11 @@ void Timeline::setCursor(ui::Message* msg, const Hit& hit)
void Timeline::getDrawableLayers(ui::Graphics* g, LayerIndex* first_layer, LayerIndex* last_layer) void Timeline::getDrawableLayers(ui::Graphics* g, LayerIndex* first_layer, LayerIndex* last_layer)
{ {
int hpx = (getClientBounds().h - HDRSIZE); int hpx = (getClientBounds().h - HDRSIZE - topHeight());
LayerIndex i = lastLayer() - LayerIndex((m_scroll_y+hpx) / LAYSIZE); LayerIndex i = lastLayer() - LayerIndex((m_scroll_y+hpx) / LAYSIZE);
i = MID(firstLayer(), i, lastLayer()); i = MID(firstLayer(), i, lastLayer());
LayerIndex j = i + LayerIndex(hpx / LAYSIZE); LayerIndex j = i + LayerIndex(hpx / LAYSIZE + 1);
if (!m_layers.empty()) if (!m_layers.empty())
j = MID(firstLayer(), j, lastLayer()); j = MID(firstLayer(), j, lastLayer());
else else
@ -2013,38 +2013,30 @@ void Timeline::updateStatusBar(ui::Message* msg)
sb->clearText(); sb->clearText();
} }
void Timeline::centerCel(LayerIndex layer, frame_t frame)
{
int target_x = (getBounds().x + m_separator_x + m_separator_w + getBounds().x2())/2 - FRMSIZE/2;
int target_y = (getBounds().y + HDRSIZE + getBounds().y2())/2 - LAYSIZE/2;
int scroll_x = getBounds().x + m_separator_x + m_separator_w + FRMSIZE*frame - target_x;
int scroll_y = getBounds().y + HDRSIZE + LAYSIZE*(lastLayer() - layer) - target_y;
setScroll(scroll_x, scroll_y);
}
void Timeline::showCel(LayerIndex layer, frame_t frame) void Timeline::showCel(LayerIndex layer, frame_t frame)
{ {
int scroll_x, scroll_y; int scroll_x, scroll_y;
int x1, y1, x2, y2; int x1, y1, x2, y2;
int left = getBounds().x + m_separator_x + m_separator_w;
int top = getBounds().y + topHeight() + HDRSIZE;
x1 = getBounds().x + m_separator_x + m_separator_w + FRMSIZE*frame - m_scroll_x; x1 = left + FRMSIZE*frame - m_scroll_x;
y1 = getBounds().y + HDRSIZE + LAYSIZE*(lastLayer() - layer) - m_scroll_y; y1 = top + LAYSIZE*(lastLayer() - layer) - m_scroll_y;
x2 = x1 + FRMSIZE - 1; x2 = x1 + FRMSIZE - 1;
y2 = y1 + LAYSIZE - 1; y2 = y1 + LAYSIZE - 1;
scroll_x = m_scroll_x; scroll_x = m_scroll_x;
scroll_y = m_scroll_y; scroll_y = m_scroll_y;
if (x1 < getBounds().x + m_separator_x + m_separator_w) { if (x1 < left) {
scroll_x -= (getBounds().x + m_separator_x + m_separator_w) - (x1); scroll_x -= left - (x1);
} }
else if (x2 > getBounds().x2()-1) { else if (x2 > getBounds().x2()-1) {
scroll_x += (x2) - (getBounds().x2()-1); scroll_x += (x2) - (getBounds().x2()-1);
} }
if (y1 < getBounds().y + HDRSIZE) { if (y1 < top) {
scroll_y -= (getBounds().y + HDRSIZE) - (y1); scroll_y -= top - (y1);
} }
else if (y2 > getBounds().y2()-1) { else if (y2 > getBounds().y2()-1) {
scroll_y += (y2) - (getBounds().y2()-1); scroll_y += (y2) - (getBounds().y2()-1);

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

@ -194,7 +194,6 @@ namespace app {
void updateByMousePos(ui::Message* msg, const gfx::Point& mousePos); void updateByMousePos(ui::Message* msg, const gfx::Point& mousePos);
Hit hitTest(ui::Message* msg, const gfx::Point& mousePos); Hit hitTest(ui::Message* msg, const gfx::Point& mousePos);
void setHot(const Hit& hit); void setHot(const Hit& hit);
void centerCel(LayerIndex layer, frame_t frame);
void showCel(LayerIndex layer, frame_t frame); void showCel(LayerIndex layer, frame_t frame);
void showCurrentCel(); void showCurrentCel();
void cleanClk(); void cleanClk();