matteo/skizzle
matteo
/
skizzle
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Ajout de shift+molette

This commit is contained in:
Mattéo Delabre 2016-04-10 01:34:58 +02:00
parent 8abbadb18c
commit 77859a77f8
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/editor.cpp
View File

@ -8,8 +8,8 @@
const sf::Color SELECT_RECT_COLOR = sf::Color(33, 33, 33, 40); const sf::Color SELECT_RECT_COLOR = sf::Color(33, 33, 33, 40);
const sf::Color SELECT_RECT_BORDER_COLOR = sf::Color(33, 33, 33, 127); const sf::Color SELECT_RECT_BORDER_COLOR = sf::Color(33, 33, 33, 127);
const float WHEEL_SCROLL_SPEED = -8.f; const float WHEEL_SCROLL_SPEED = -7.f;
const float POINTER_SCROLL_SPEED = 8.f; const float POINTER_SCROLL_SPEED = 5.f;
const float POINTER_SCROLL_MAX_SPEED = 10.f; const float POINTER_SCROLL_MAX_SPEED = 10.f;
const float POINTER_SCROLL_STEP = 64.f; const float POINTER_SCROLL_STEP = 64.f;
const float ASSUME_TITLEBAR = 32.f; const float ASSUME_TITLEBAR = 32.f;
@ -144,9 +144,17 @@ void Editor::processEvent(const sf::Event& event) {
if (event.type == sf::Event::MouseWheelScrolled) { if (event.type == sf::Event::MouseWheelScrolled) {
sf::View camera = getCamera(); sf::View camera = getCamera();
if (event.mouseWheelScroll.wheel == sf::Mouse::HorizontalWheel) { // la molette est horizontale ssi. elle l'est vraiment ou
// si on utilise la molette verticale et shift
bool horizontal = (
event.mouseWheelScroll.wheel == sf::Mouse::HorizontalWheel ||
(event.mouseWheelScroll.wheel == sf::Mouse::VerticalWheel &&
getManager().isKeyPressed(Manager::Modifier::SHIFT))
);
if (horizontal) {
camera.move(sf::Vector2f(event.mouseWheelScroll.delta, 0) * WHEEL_SCROLL_SPEED); camera.move(sf::Vector2f(event.mouseWheelScroll.delta, 0) * WHEEL_SCROLL_SPEED);
} else if (event.mouseWheelScroll.wheel == sf::Mouse::VerticalWheel) { } else {
camera.move(sf::Vector2f(0, event.mouseWheelScroll.delta) * WHEEL_SCROLL_SPEED); camera.move(sf::Vector2f(0, event.mouseWheelScroll.delta) * WHEEL_SCROLL_SPEED);
} }