From 3be5e4e637121ab5a6c69688f18a64396e72d202 Mon Sep 17 00:00:00 2001
From: fgenesis <false.genesis@googlemail.com>
Date: Sun, 20 Nov 2011 18:34:41 +0100
Subject: [PATCH] Revert "animation editor: fixed widescreen bug that caused
 bones to jump a distance to the left when clicked. reposition mouse only if
 necessary. one additional output text."

This reverts commit 5c1169727c8f05ab77c8f8d4d8676dbd752314a5.
---
 Aquaria/AnimationEditor.cpp | 35 ++++++++++-------------------------
 Aquaria/States.h            |  2 +-
 2 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/Aquaria/AnimationEditor.cpp b/Aquaria/AnimationEditor.cpp
index e66875d..41b5d8f 100644
--- a/Aquaria/AnimationEditor.cpp
+++ b/Aquaria/AnimationEditor.cpp
@@ -44,14 +44,15 @@ Bone *lastSelectedBone = 0;
 void AnimationEditor::constrainMouse()
 {
 	Vector mp=core->mouse.position;
-	bool doit = false;
-	if (mp.x < 200)	{ mp.x = 200; doit = true; }
-	if (mp.x > 600)	{ mp.x = 600; doit = true; }
-	if (mp.y < 100)	{ mp.y = 100; doit = true; }
-	if (mp.y > 500)	{ mp.y = 500; doit = true; }
+	if (mp.x < 200)	mp.x = 200;
+	if (mp.x > 600)	mp.x = 600;
+	if (mp.y < 100)	mp.y = 100;
+	if (mp.y > 500)	mp.y = 500;
+	core->setMousePosition(mp);
 
-	if(doit)
-		core->setMousePosition(mp);
+	std::ostringstream os;
+	os << "mp(" << mp.x << ", " << mp.y << ")";
+	debugLog(os.str());
 }
 
 KeyframeWidget::KeyframeWidget(int key) : Quad()
@@ -406,11 +407,6 @@ void AnimationEditor::applyState()
 	text->setFontSize(6);
 	addRenderObject(text, LR_HUD);
 
-	text2 = new DebugFont();
-	text2->position = Vector(200,510);
-	text2->setFontSize(6);
-	addRenderObject(text2, LR_HUD);
-
 	editSprite->setSelectedBone(0);
 
 	dsq->overlay->alpha.interpolateTo(0, 0.5);
@@ -660,24 +656,13 @@ void AnimationEditor::update(float dt)
 		os << " keyTime: " << k->t;
 	}
 
-	Vector ebdata;
-
 	if (editingBone)
 	{
 		os << " bone: " << editingBone->name;
-		ebdata.x = editingBone->position.x;
-		ebdata.y = editingBone->position.y;
-		ebdata.z = editingBone->rotation.z;
+
 	}
 	text->setText(os.str());
 
-	char t2buf[256];
-	sprintf(t2buf, "Bone x: %.3f, y: %.3f, rot: %.3f, idx: %d", ebdata.x, ebdata.y,
-		ebdata.z, editSprite->getSelectedBoneIdx());
-	text2->setText(t2buf);
-
-
-
 	if (core->mouse.buttons.middle)
 	{
 		editSprite->position += core->mouse.change;
@@ -752,7 +737,7 @@ void AnimationEditor::update(float dt)
 	}
 	if (editingBone && boneEdit == 1)
 	{
-		editingBone->position = core->mouse.position - editSprite->position + cursorOffset;
+		editingBone->position = core->mouse.position - editSprite->position + cursorOffset + core->getVirtualOffX();
 		constrainMouse();
 	}
 	if (editingBone && boneEdit == 2)
diff --git a/Aquaria/States.h b/Aquaria/States.h
index 78db218..845d6b5 100644
--- a/Aquaria/States.h
+++ b/Aquaria/States.h
@@ -214,7 +214,7 @@ public:
 	SkeletalSprite *editSprite;
 	Bone *editingBone;
 	int boneEdit;
-	DebugFont *text, *text2;
+	DebugFont *text;
 	int ignoreBone;
 
 	void ignoreBone0();