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

Fix problem initializing oldX/Width fields for the docked tab

Browse Source 
This fixes a problem creating interpolation between random
oldX/Width values and x/width fields. I've added some special values
in the initialization of a Tab to know if we are using uninitialized
values oldX/Width/x/width values in the animation.
This commit is contained in:
David Capello 2015-05-04 18:16:29 -03:00
parent ae03dd5461
commit bdf28c01de
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/app/ui/tabs.cpp
View File

@ -307,8 +307,6 @@ bool Tabs::onProcessMessage(Message* msg)
}
// We are drag a tab...
else {
TabPtr justDocked(nullptr);
// Floating tab (to create a new window)
if (!getBounds().contains(mousePos) &&
(ABS(delta.y) > 16*guiscale() ||
@ -335,7 +333,6 @@ bool Tabs::onProcessMessage(Message* msg)
}
}
else {
justDocked = m_floatingTab;
destroyFloatingTab();
if (m_delegate)
@ -344,10 +341,8 @@ bool Tabs::onProcessMessage(Message* msg)
// Docked tab
if (!m_floatingTab) {
m_dragTab->x = m_dragTabX + delta.x;
m_dragTab->oldX = m_dragTab->x = m_dragTabX + delta.x;
updateDragTabIndexes(mousePos.x, false);
if (justDocked)
justDocked->oldX = m_dragTabX + delta.x;
}
invalidate();
@ -753,6 +748,11 @@ void Tabs::resetOldPositions(double t)
if (tab == m_floatingTab)
continue;
ASSERT(tab->x != 0xfefefefe);
ASSERT(tab->width != 0xfefefefe);
ASSERT(tab->oldX != 0xfefefefe);
ASSERT(tab->oldWidth != 0xfefefefe);
tab->oldX = int(inbetween(tab->oldX, tab->x, t));
tab->oldWidth = int(inbetween(tab->oldWidth, tab->width, t));
}
@ -781,9 +781,9 @@ void Tabs::startDrag()
m_isDragging = true;
m_dragCopy = false;
m_dragTab.reset(new Tab(m_selected->view));
m_dragTab->x = m_selected->x;
m_dragTab->width = m_selected->width;
m_dragTabX = m_selected->x;
m_dragTab->oldX = m_dragTab->x = m_dragTabX = m_selected->x;
m_dragTab->oldWidth = m_dragTab->width = m_selected->width;
m_dragTabIndex =
m_dragCopyIndex = std::find(m_list.begin(), m_list.end(), m_selected) - m_list.begin();
@ -871,6 +871,11 @@ gfx::Rect Tabs::getTabBounds(Tab* tab)
box.w = tab->width;
}
else {
ASSERT(tab->x != 0xfefefefe);
ASSERT(tab->width != 0xfefefefe);
ASSERT(tab->oldX != 0xfefefefe);
ASSERT(tab->oldWidth != 0xfefefefe);
box.x = startX + int(inbetween(tab->oldX, tab->x, t));
box.w = int(inbetween(tab->oldWidth, tab->width, t));
}

9
src/app/ui/tabs.h
View File

@ -119,6 +119,15 @@ namespace app {
ASSERT(view);
text = view->getTabText();
icon = view->getTabIcon();
x = width = oldX = oldWidth =
#if _DEBUG
0xfefefefe;
#else
0;
#endif
modified = false;
}
};