mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-01-21 13:10:04 -05:00
--Bug fixes:
-Query matrices when drawing affines even if they are set not to be drawn because the values are used elsewhere. -No longer need to move library items on a delayed timer when dragging and dropping.
This commit is contained in:
parent
621a037c2a
commit
2fba807777
@ -286,10 +286,11 @@ void GLEmberController<T>::DrawImage()
|
||||
template <typename T>
|
||||
void GLEmberController<T>::DrawAffines(bool pre, bool post)
|
||||
{
|
||||
QueryVMP();//Resolves to float or double specialization function depending on T.
|
||||
|
||||
if (!m_Fractorium->DrawXforms() || (m_DragState == eDragState::DragRotateScale))
|
||||
return;
|
||||
|
||||
QueryVMP();//Resolves to float or double specialization function depending on T.
|
||||
auto ember = m_FractoriumEmberController->CurrentEmber();
|
||||
bool dragging = m_DragState == eDragState::DragDragging;
|
||||
|
||||
|
@ -72,7 +72,7 @@ void LibraryTreeWidget::dropEvent(QDropEvent* de)
|
||||
auto itemrow = offsetitem.row();//Will be at least 1 if dropped above it.
|
||||
auto offset = itemrow;
|
||||
|
||||
for (i = 0; i < dragItems.size(); i++)
|
||||
for (i = 0; i < dragItems.size() && offset > 0; i++)
|
||||
{
|
||||
offset--;
|
||||
|
||||
@ -91,6 +91,6 @@ void LibraryTreeWidget::dropEvent(QDropEvent* de)
|
||||
}
|
||||
}
|
||||
|
||||
QTimer::singleShot(500, [ = ]() { m_Fractorium->m_Controller->MoveLibraryItems(items, row); });//Need to fire this after this event has internally reshuffled the items.
|
||||
m_Fractorium->m_Controller->MoveLibraryItems(items, row);
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user