Fix drawing bugs in the battery, disk, and net graphs.

Author: mikepj

Graph Views/XRGBatteryView.m

@@ -222,11 +222,11 @@ - (void)drawRect:(NSRect)rect {
     // draw the battery bar
     [[appSettings graphFG1Color] set];
     if (self.batteryMiner.batteries.count) {
-        percentRect.size.width = rect.size.width * ((float)[self.batteryMiner chargePercent] / 100.);
-		
+        percentRect.size.width = bounds.size.width * ((float)[self.batteryMiner chargePercent] / 100.);
+
 		if ([self shouldDrawMiniGraph]) {
-			percentRect.origin.y = self.bounds.origin.y;
-			percentRect.size.height = self.bounds.size.height;
+			percentRect.origin.y = bounds.origin.y;
+			percentRect.size.height = bounds.size.height;
 		}
 
         NSRectFill(percentRect);
@@ -237,7 +237,7 @@ - (void)drawRect:(NSRect)rect {
     if (powerStatus == XRGBatteryStatusCharging) {
         NSRect chargingRect = NSMakeRect(percentRect.origin.x + percentRect.size.width, 
                                          percentRect.origin.y,
-                                         (rect.size.width - percentRect.size.width) * ((float)tripleCount / 3.),
+                                         (bounds.size.width - percentRect.size.width) * ((float)tripleCount / 3.),
                                          percentRect.size.height);
 
         NSRectFill(chargingRect);
@@ -247,8 +247,8 @@ - (void)drawRect:(NSRect)rect {
 
 	if (![self shouldDrawMiniGraph]) {
         // Draw the watts bar
-        percentRect.origin.x = rect.size.width / 2.;
-        percentRect.size.width = (rect.size.width / 2.) * (fabs(currentWatts) / maxWatts);
+        percentRect.origin.x = bounds.size.width / 2.;
+        percentRect.size.width = (bounds.size.width / 2.) * (fabs(currentWatts) / maxWatts);
         if (currentWatts < 0) {
             percentRect.origin.x -= percentRect.size.width;
         }
@@ -266,8 +266,8 @@ - (void)drawRect:(NSRect)rect {
 		NSRectFill(percentRect);
 
 		// Fill the split bar for the amp graph
-		NSRectFill(NSMakeRect((rect.size.width / 2.) - 1., topOfGraph, 2., textRectHeight + 2.));
-		
+		NSRectFill(NSMakeRect((bounds.size.width / 2.) - 1., topOfGraph, 2., textRectHeight + 2.));
+
 		// Draw the battery capacity graph, only if there is space for it on the graph.
 		percentRect.size.width = graphSize.width;
 		percentRect.origin.y = 0;

Graph Views/XRGDiskView.m

@@ -313,11 +313,11 @@ - (void)drawRect:(NSRect)rect {
         for (i = 0; i < numSamples; ++i) data[i] = (CGFloat)values[i];
     }
 
-    [self drawGraphWithData:data size:numSamples currentIndex:currentIndex maxValue:maxVal inRect:rect flipped:([appSettings diskGraphMode] == 1) color: [appSettings graphFG2Color]];
-    
+    [self drawGraphWithData:data size:numSamples currentIndex:currentIndex maxValue:maxVal inRect:bounds flipped:([appSettings diskGraphMode] == 1) color: [appSettings graphFG2Color]];
+
     for (i = 0; i < numSamples; ++i) data[i] = (CGFloat)writeValues[i];
 
-    [self drawGraphWithData:data size:numSamples currentIndex:currentIndex maxValue:maxVal inRect:rect flipped:([appSettings diskGraphMode] == 2) color: [appSettings graphFG1Color]];
+    [self drawGraphWithData:data size:numSamples currentIndex:currentIndex maxValue:maxVal inRect:bounds flipped:([appSettings diskGraphMode] == 2) color: [appSettings graphFG1Color]];
 
     [gc setShouldAntialias:YES];
 

Graph Views/XRGNetView.m

@@ -132,14 +132,14 @@ - (void)drawRect:(NSRect)rect {
 
     /* received data */
     if (netGraphMode == 0) {
-        [self drawGraphWithDataFromDataSet:self.miner.totalValues maxValue:max inRect:rect flipped:(netGraphMode == 2) filled:YES color:[appSettings graphFG2Color]];
+        [self drawGraphWithDataFromDataSet:self.miner.totalValues maxValue:max inRect:bounds flipped:(netGraphMode == 2) filled:YES color:[appSettings graphFG2Color]];
     }
     else {
-        [self drawGraphWithDataFromDataSet:self.miner.rxValues maxValue:max inRect:rect flipped:(netGraphMode == 2) filled:YES color:[appSettings graphFG2Color]];
+        [self drawGraphWithDataFromDataSet:self.miner.rxValues maxValue:max inRect:bounds flipped:(netGraphMode == 2) filled:YES color:[appSettings graphFG2Color]];
     }
 
     /* sent data */
-    [self drawGraphWithDataFromDataSet:self.miner.txValues maxValue:max inRect:rect flipped:(netGraphMode == 1) filled:YES color:[appSettings graphFG1Color]];
+    [self drawGraphWithDataFromDataSet:self.miner.txValues maxValue:max inRect:bounds flipped:(netGraphMode == 1) filled:YES color:[appSettings graphFG1Color]];
 
     [gc setShouldAntialias:YES];