logic: fixed Searchbutton not searching and wrong destruction order in ComponentManager
This commit is contained in:
@@ -32,7 +32,7 @@ void ComponentManager::setup(ViewLayout* viewLayout)
|
||||
|
||||
std::shared_ptr<CompositeView> compositeView =
|
||||
m_componentFactory->getViewFactory()->createCompositeView(viewLayout, CompositeView::DIRECTION_HORIZONTAL);
|
||||
m_views.push_back(compositeView);
|
||||
m_compositeViews.push_back(compositeView);
|
||||
|
||||
std::shared_ptr<Component> undoRedoComponent = m_componentFactory->createUndoRedoComponent(compositeView.get());
|
||||
m_components.push_back(undoRedoComponent);
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
#include "data/access/LocationAccess.h"
|
||||
#include "data/access/GraphAccess.h"
|
||||
|
||||
class CompositeView;
|
||||
class View;
|
||||
class ViewFactory;
|
||||
class ViewLayout;
|
||||
@@ -30,8 +31,8 @@ private:
|
||||
|
||||
std::shared_ptr<ComponentFactory> m_componentFactory;
|
||||
|
||||
std::vector<std::shared_ptr<CompositeView>> m_compositeViews;
|
||||
std::vector<std::shared_ptr<Component>> m_components;
|
||||
std::vector<std::shared_ptr<View>> m_views;
|
||||
};
|
||||
|
||||
#endif // COMPONENT_MANAGER_H
|
||||
|
||||
Reference in New Issue
Block a user