From dd54596cb7afb46ee071363aa623b45205094344 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matt=C3=A9o=20Delabre?= Date: Thu, 28 Apr 2016 10:32:54 +0200 Subject: [PATCH] =?UTF-8?q?Correction=20du=20d=C3=A9filement=20=C3=A0=20la?= =?UTF-8?q?=20souris=20(pointeur)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/states/editor.cpp | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/src/states/editor.cpp b/src/states/editor.cpp index cf9cdca..2540a2c 100644 --- a/src/states/editor.cpp +++ b/src/states/editor.cpp @@ -277,17 +277,28 @@ void Editor::frame() { sf::Vector2i mouse = sf::Mouse::getPosition(window); // détection du dépassement sur un des 4 bords - if (mouse.x < POINTER_SCROLL_PADDING && mouse.x >= -POINTER_SCROLL_PADDING) { - cur_center.x -= POINTER_SCROLL_SPEED; - } else if (mouse.x >= window_size.x - POINTER_SCROLL_PADDING && mouse.x < window_size.x + POINTER_SCROLL_PADDING) { - cur_center.x += POINTER_SCROLL_SPEED; - } else if (mouse.y < POINTER_SCROLL_PADDING && mouse.y >= -POINTER_SCROLL_PADDING) { - cur_center.y -= POINTER_SCROLL_SPEED; - } else if (mouse.y >= window_size.y - POINTER_SCROLL_PADDING && mouse.y < window_size.y + POINTER_SCROLL_PADDING) { - cur_center.y += POINTER_SCROLL_SPEED; - } + if (mouse.x >= -POINTER_SCROLL_PADDING && + mouse.x < window_size.x + POINTER_SCROLL_PADDING && + mouse.y >= -POINTER_SCROLL_PADDING && + mouse.y < window_size.y + POINTER_SCROLL_PADDING) { + if (mouse.x < POINTER_SCROLL_PADDING) { + cur_center.x -= POINTER_SCROLL_SPEED; + } - setCenterGoal(cur_center); + if (mouse.x >= window_size.x - POINTER_SCROLL_PADDING) { + cur_center.x += POINTER_SCROLL_SPEED; + } + + if (mouse.y < POINTER_SCROLL_PADDING) { + cur_center.y -= POINTER_SCROLL_SPEED; + } + + if (mouse.y >= window_size.y - POINTER_SCROLL_PADDING) { + cur_center.y += POINTER_SCROLL_SPEED; + } + + setCenterGoal(cur_center); + } } // màj du titre de la fenêtre