Merge lp://qastaging/~thomas-moenicke/nuxplayground/nuxplayground-calculator into lp://qastaging/nuxplayground

Proposed by Thomas Moenicke
Status: Approved
Approved by: Thomas Moenicke
Approved revision: 41
Proposed branch: lp://qastaging/~thomas-moenicke/nuxplayground/nuxplayground-calculator
Merge into: lp://qastaging/nuxplayground
Diff against target: 861 lines (+740/-6)
14 files modified
configure.ac (+1/-0)
data/Makefile.am (+7/-1)
src/Makefile.am (+6/-4)
src/calculator/CalculatorButton.cpp (+71/-0)
src/calculator/CalculatorButton.h (+25/-0)
src/calculator/CalculatorDisplay.cpp (+25/-0)
src/calculator/CalculatorDisplay.h (+27/-0)
src/calculator/CalculatorTextCanvas.cpp (+147/-0)
src/calculator/CalculatorTextCanvas.h (+51/-0)
src/calculator/CalculatorView.cpp (+231/-0)
src/calculator/CalculatorView.h (+89/-0)
src/calculator/Makefile.am (+37/-0)
src/calculator/main.cpp (+22/-0)
src/text-input/text-input.cpp (+1/-1)
To merge this branch: bzr merge lp://qastaging/~thomas-moenicke/nuxplayground/nuxplayground-calculator
Reviewer Review Type Date Requested Status
Nicolas d'Offay (community) Approve
Review via email: mp+130133@code.qastaging.launchpad.net

Commit message

Adding a calculator example to nuxplayground

To post a comment you must log in.
Revision history for this message
Nicolas d'Offay (nicolas-doffay) wrote :

Works great!

review: Approve

Unmerged revisions

41. By Thomas Moenicke

adding missing files

40. By Thomas Moenicke

objects to be deleted

39. By Thomas Moenicke

CalculatorTextCanvas: adding operators

38. By Thomas Moenicke

adding blur for operators

37. By Thomas Moenicke

CalculatorTextCanvas: animation internals should be private

36. By Thomas Moenicke

renamed methods in CalculatorTextCanvas

35. By Thomas Moenicke

adding timeline for ease-in animation of blurred text

34. By Thomas Moenicke

adding a text canvas for showing blurred text in the background. The first operator of a term will be pushed there so it is still visible when typing the second operator

33. By Thomas Moenicke

adding background
changed dimensions
improved buttons

32. By Thomas Moenicke

make sure the Texture object is always valid: constructor fails when file doesn't exist
using Texture2D instead of BaseTexture

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: