fixed Bug: Flicable in BudgetView not clipping

thmichel · May 20, 2015 · 72e7923 · 72e7923
1 parent 83c26e9
commit 72e7923
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/car.cpp b/car.cpp
@@ -664,7 +664,6 @@ double Car::budget_fuel_total()
 }
 double Car::budget_fuel()
 {
-<<<<<<< HEAD
     /* Return sum(fuel price) / ODO * 100 */
     unsigned long int maxDistance = 0;
     unsigned long int minDistance = 999999999;
@@ -736,8 +735,6 @@ double Car::budget_invest()
 double Car::budget_tire()
 {
     //returns tire costs per 100km
-=======
->>>>>>> upstream/master
     return budget_tire_total() / ((maxdistance() - mindistance())/ 100.0);
 }
 double Car::budget_tire_total()

diff --git a/qml/pages/BudgetView.qml b/qml/pages/BudgetView.qml
@@ -42,10 +42,9 @@ Page {
         id: pieChart
         width: { return parent.width < parent.height ? parent.width/2 : parent.height/2 }
         height: { return parent.width < parent.height ? parent.width/2 : parent.height/2 }
-        //width: budgetPage.width/2
-        //height:budgetPage.height/2
         anchors.top: header.bottom
         anchors.left: parent.left
+
         onPaint: {
             var ctx = pieChart.getContext('2d')
             ctx.clearRect(0,0,width,height)
@@ -182,6 +181,8 @@ Page {
         leftMargin: Theme.paddingMedium
         rightMargin: Theme.paddingMedium
         contentHeight: dataColumn.height
+        clip:true
+
         Column {
             id: dataColumn
             width: parent.width- Theme.paddingMedium - Theme.paddingMedium