[aseprite] 188/308: Merge branch 'new-scroll'

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit e985227d954565c2b9094d3d1ea8121661b07352
Merge: 6123885 b0650f6
Author: David Capello <davidcapello at gmail.com>
Date:   Tue Jan 5 20:49:36 2016 -0300

    Merge branch 'new-scroll'

 data/widgets/file_selector.xml                  |   4 +-
 src/app/CMakeLists.txt                          |   3 +-
 src/app/commands/cmd_scroll.cpp                 |   2 +-
 src/app/ui/editor/drawing_state.cpp             |   2 +-
 src/app/ui/editor/editor.cpp                    |  51 +++-----
 src/app/ui/editor/editor.h                      |   5 +-
 src/app/ui/editor/editor_view.cpp               |  31 ++++-
 src/app/ui/editor/editor_view.h                 |   4 +-
 src/app/ui/editor/moving_pixels_state.cpp       |   2 +-
 src/app/ui/editor/scrolling_state.cpp           |   4 +-
 src/app/ui/editor/state_with_wheel_behavior.cpp |   2 +-
 src/app/ui/file_list.cpp                        |  64 ++++++---
 src/app/ui/file_list.h                          |  10 +-
 src/app/ui/file_list_view.cpp                   |  35 +++++
 src/app/ui/file_list_view.h                     |  26 ++++
 src/app/ui/file_selector.cpp                    |   9 +-
 src/app/ui/file_selector.h                      |   4 +-
 src/gfx/region.h                                |   7 +-
 src/ui/manager.cpp                              |   7 +
 src/ui/manager.h                                |  16 ++-
 src/ui/scroll_region_event.h                    |  30 +++++
 src/ui/view.cpp                                 | 166 +++++++++++++++++++++---
 src/ui/view.h                                   |   5 +-
 src/ui/widget.cpp                               |  45 ++-----
 src/ui/widget.h                                 |  12 +-
 25 files changed, 409 insertions(+), 137 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git