Revision 2bdadb2...

Go back to digest for 8th June 2014

Features in Educational

Dennis Nienhüser committed changes in [marble] /:

Marble input handling refactoring, event handling in MarbleQuickItem

- Mouse, touch and pinch input handling for MarbleQuickItem (keyboard
was enabled earlier)

Other changes:
- Refactored input handling to reuse code, broke into smaller pieces
- Extended the example (marbleQuick2)

Known issues:
- Some refactoring still should be done around input classes
- Inertial rotation is disabled by default in MarbleQuickItem because
of some issues (mostly touch-related). However, issues are rather
minor so feel free to enable it back.

REVIEW: 118495

File Changes

Added 2 files
  • /lib/marble
  •   src/MarbleInputHandler.cpp
  •   src/MarbleInputHandler.h
Modified 10 files
  •   examples/cpp/marbleQuick2/main.cpp
  •   examples/cpp/marbleQuick2/main.qml
  •   src/lib/marble/CMakeLists.txt
  •   src/lib/marble/MarbleAbstractPresenter.cpp
  •   src/lib/marble/MarbleAbstractPresenter.h
  •   src/lib/marble/MarbleQuickItem.cpp
  •   src/lib/marble/MarbleQuickItem.h
  •   src/lib/marble/MarbleWidget.cpp
  •   src/lib/marble/MarbleWidgetInputHandler.cpp
  •   src/lib/marble/MarbleWidgetInputHandler.h
12 files changed in total