Commit b6efddfe authored by Jan Möbius's avatar Jan Möbius

Use right datatype for proxies

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@13314 383ad7c9-94d9-4d36-a494-682f7c89f535
parent bd53d6c4
......@@ -670,7 +670,7 @@ public:
QScrollArea* toolBoxScroll_;
/// Handle to picking toolbar
typedef std::map<QToolBar*,QGraphicsItem*> PickToolBarMap;
typedef std::map<QToolBar*,QGraphicsProxyWidget*> PickToolBarMap;
PickToolBarMap curPickingToolbarItems_;
/// Extra toolbar not in scene for picking
......
......@@ -197,7 +197,7 @@ void CoreWidget::setActivePickToolBar(QToolBar* _tool) {
_tool->adjustSize();
// Add widget to the gl scene
QGraphicsItem* item = glScene_->addWidget(_tool);
QGraphicsProxyWidget* item = glScene_->addWidget(_tool);
// Put it into center of the screen
int midP = (glScene_->width() / 2) - (int)(_tool->width() / 2);
......@@ -206,7 +206,7 @@ void CoreWidget::setActivePickToolBar(QToolBar* _tool) {
item->show();
// Remember it as being part of the scene
curPickingToolbarItems_.insert(std::pair<QToolBar*,QGraphicsItem*>(_tool,item));
curPickingToolbarItems_.insert(std::pair<QToolBar*,QGraphicsProxyWidget*>(_tool,item));
} else {
// Widget has already been added once, so just show it
ret->second->show();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment