Skip to content

Editor: Canceling of the drag doesn't work complete #646 #647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eprikazchikov merged 1 commit into from
Dec 26, 2023
Merged

Editor: Canceling of the drag doesn't work complete #646 #647

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions worldeditor/src/screens/scenecomposer/objectcontroller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
#include <editor/projectmanager.h>
#include <editor/settingsmanager.h>

#include <QDebug>

namespace {
const char *gBackgroundColor("General/Colors/Background_Color");
const char *gIsolationColor("General/Colors/Isolation_Color");
Expand Down Expand Up @@ -229,6 +231,15 @@ void ObjectController::update() {
}
}

if(Input::isMouseButtonDown(Input::MOUSE_LEFT)) {
if(!m_drag) {
if(Handles::s_Axes) {
m_axes = Handles::s_Axes;
setDrag(true);
}
}
}

if(Input::isMouseButtonUp(Input::MOUSE_LEFT)) {
if(!m_drag) {
if(!m_canceled) {
Expand Down Expand Up @@ -282,10 +293,6 @@ void ObjectController::update() {
if(Input::isKey(Input::KEY_LEFT_SHIFT)) {
UndoManager::instance()->push(new DuplicateObjects(this));
}
if(Handles::s_Axes) {
m_axes = Handles::s_Axes;
setDrag(true);
}
} else {
emit sceneUpdated(nullptr);
}
Expand Down