mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-09 21:44:54 +00:00
Code Issues Projects Releases Wiki Activity

Revert unintended changes

Browse Source
This commit is contained in:
Nelsson Huotari 2018-05-06 18:13:15 +03:00
parent 5656745445
commit d33c98c68d
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/opencs/view/render/worldspacewidget.cpp
View File

@ -576,6 +576,7 @@ void CSVRender::WorldspaceWidget::debugProfileAboutToBeRemoved (const QModelInde
void CSVRender::WorldspaceWidget::editModeChanged (const std::string& id) void CSVRender::WorldspaceWidget::editModeChanged (const std::string& id)
{ {
dynamic_cast<CSVRender::EditMode&> (*mEditMode->getCurrent()).setEditLock (mLocked);
mDragging = false; mDragging = false;
mDragMode = InteractionType_None; mDragMode = InteractionType_None;
} }

9
apps/opencs/view/widget/scenetoolmode.cpp
View File

@ -134,15 +134,6 @@ void CSVWidget::SceneToolMode::setButton (const std::string& id)
} }
} }
void CSVWidget::SceneToolMode::mouseReleaseEvent (QMouseEvent *event)
{
if (getType()==Type_TopAction && event->button()==Qt::RightButton)
showPanel (parentWidget()->mapToGlobal (pos()));
else
PushButton::mouseReleaseEvent (event);
}
bool CSVWidget::SceneToolMode::event(QEvent* event) bool CSVWidget::SceneToolMode::event(QEvent* event)
{ {
if (event->type() == QEvent::ToolTip) if (event->type() == QEvent::ToolTip)

2
apps/opencs/view/widget/scenetoolmode.hpp
View File

@ -44,8 +44,6 @@ namespace CSVWidget
void setButton (std::map<ModeButton *, std::string>::iterator iter); void setButton (std::map<ModeButton *, std::string>::iterator iter);
void mouseReleaseEvent (QMouseEvent *event);
protected: protected:
bool event(QEvent* event); bool event(QEvent* event);