mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-02-01 18:40:12 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

--Bug fixes:

Browse Source 
-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:
Person 2017-03-04 07:46:28 -08:00
parent 621a037c2a
commit 2fba807777
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Fractorium/GLWidget.cpp
View File

@ -286,10 +286,11 @@ void GLEmberController<T>::DrawImage()
template <typename T> template <typename T>
void GLEmberController<T>::DrawAffines(bool pre, bool post) 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)) if (!m_Fractorium->DrawXforms() || (m_DragState == eDragState::DragRotateScale))
return; return;
QueryVMP();//Resolves to float or double specialization function depending on T.
auto ember = m_FractoriumEmberController->CurrentEmber(); auto ember = m_FractoriumEmberController->CurrentEmber();
bool dragging = m_DragState == eDragState::DragDragging; bool dragging = m_DragState == eDragState::DragDragging;

4
Source/Fractorium/LibraryTreeWidget.cpp
View File

@ -72,7 +72,7 @@ void LibraryTreeWidget::dropEvent(QDropEvent* de)
auto itemrow = offsetitem.row();//Will be at least 1 if dropped above it. auto itemrow = offsetitem.row();//Will be at least 1 if dropped above it.
auto offset = itemrow; auto offset = itemrow;
for (i = 0; i < dragItems.size(); i++) for (i = 0; i < dragItems.size() && offset > 0; i++)
{ {
offset--; 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);
} }
} }