mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-02-03 20:54:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modify zoom tool so we can click and drag the mouse in X axis to zoom in/out

Browse Source
This commit is contained in:
David Capello 2014-11-28 00:23:07 -03:00
parent 5c9c05ebe7
commit 21988f277c
2 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/app/ui/editor/zooming_state.cpp
View File

@ -1,5 +1,5 @@
/* Aseprite
* Copyright (C) 2001-2013 David Capello
* Copyright (C) 2001-2014 David Capello
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -36,6 +36,8 @@ namespace app {
using namespace ui;
ZoomingState::ZoomingState()
: m_startZoom(1, 1)
, m_moved(false)
{
}
@ -45,7 +47,8 @@ ZoomingState::~ZoomingState()
bool ZoomingState::onMouseDown(Editor* editor, MouseMessage* msg)
{
m_oldPos = msg->position();
m_startPos = msg->position();
m_startZoom = editor->zoom();
editor->captureMouse();
return true;
@ -53,15 +56,17 @@ bool ZoomingState::onMouseDown(Editor* editor, MouseMessage* msg)
bool ZoomingState::onMouseUp(Editor* editor, MouseMessage* msg)
{
Zoom zoom = editor->zoom();
if (!m_moved) {
Zoom zoom = editor->zoom();
if (msg->left())
zoom.in();
else if (msg->right())
zoom.out();
if (msg->left())
zoom.in();
else if (msg->right())
zoom.out();
editor->setZoomAndCenterInMouse(zoom,
msg->position(), Editor::kCofiguredZoomBehavior);
editor->setZoomAndCenterInMouse(zoom,
msg->position(), Editor::kCofiguredZoomBehavior);
}
editor->backToPreviousState();
editor->releaseMouse();
@ -70,6 +75,24 @@ bool ZoomingState::onMouseUp(Editor* editor, MouseMessage* msg)
bool ZoomingState::onMouseMove(Editor* editor, MouseMessage* msg)
{
gfx::Point pt = (msg->position() - m_startPos);
int length = ABS(pt.x);
Zoom zoom = m_startZoom;
if (length > 0) {
if (pt.x > 0) {
while (length--)
zoom.in();
}
else {
while (length--)
zoom.out();
}
}
editor->setZoomAndCenterInMouse(zoom,
m_startPos, Editor::kDontCenterOnZoom);
return true;
}

7
src/app/ui/editor/zooming_state.h
View File

@ -1,5 +1,5 @@
/* Aseprite
* Copyright (C) 2001-2013 David Capello
* Copyright (C) 2001-2014 David Capello
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -21,6 +21,7 @@
#pragma once
#include "app/ui/editor/editor_state.h"
#include "app/zoom.h"
#include "gfx/point.h"
namespace app {
@ -39,7 +40,9 @@ namespace app {
virtual bool onUpdateStatusBar(Editor* editor) override;
private:
gfx::Point m_oldPos;
gfx::Point m_startPos;
Zoom m_startZoom;
bool m_moved;
};
} // namespace app