Ticket #7937: time_clock_21082011.patch

src/preferences/time/AnalogClock.h

@@ -27 +27 @@
     virtual void            MouseUp(BPoint point);
     virtual void            MouseMoved(BPoint point, uint32 transit,
                                 const BMessage* message);
-    virtual void            FrameResized(float, float);
-    
+    virtual void            DoLayout();
+
     virtual BSize           MaxSize();
     virtual BSize           MinSize();
     virtual BSize           PreferredSize();
@@ -60 +60 @@
             int32           fMinutes;
             int32           fSeconds;
             bool            fDirty;
-            
+
             float           fCenterX;
             float           fCenterY;
             float           fRadius;
@@ -70 +70 @@
             bool            fDrawSecondHand;
             bool            fInteractive;
 
-            bool            fTimeChangeIsOngoing;   
+            bool            fTimeChangeIsOngoing;
 };
 
 

src/preferences/time/AnalogClock.cpp

@@ -98 +98 @@
         BView::MouseDown(point);
         return;
     }
-    
+
     if (InMinuteHand(point)) {
         fMinuteDragging = true;
         fDirty = true;
@@ -124 +124 @@
         BView::MouseUp(point);
         return;
     }
-    
+
     if (fHourDragging || fMinuteDragging) {
         int32 hour, minute, second;
         GetTime(&hour, &minute, &second);
@@ -160 +160 @@
 
 
 void
-TAnalogClock::FrameResized(float, float)
+TAnalogClock::DoLayout()
 {
     BRect bounds = Bounds();
 
@@ -168 +168 @@
     // (important when drawing with B_SUBPIXEL_PRECISE)
     fCenterX = floorf((bounds.left + bounds.right) / 2 + 0.5) + 0.5;
     fCenterY = floorf((bounds.top + bounds.bottom) / 2 + 0.5) + 0.5;
-    fRadius = floorf((MIN(bounds.Width(), bounds.Height()) / 2.0)) - 2.5;
-    fRadius -= 3;
+    fRadius = floorf((MIN(bounds.Width(), bounds.Height()) / 2.0)) - 5.5;
 }
 
 
@@ -202 +201 @@
     // don't set the time if the hands are in a drag action
     if (fHourDragging || fMinuteDragging || fTimeChangeIsOngoing)
         return;
-    
+
     if (fHours == hour && fMinutes == minute && fSeconds == second)
         return;
 
@@ -254 +253 @@
     rgb_color background = ui_color(B_PANEL_BACKGROUND_COLOR);
     SetHighColor(background);
     FillRect(bounds);
-    
+
     bounds.Set(fCenterX - fRadius, fCenterY - fRadius,
         fCenterX + fRadius, fCenterY + fRadius);
 
@@ -459 +458 @@
         offsetY = (radius * 0.95) * cosf((fSeconds * M_PI) / 30.0);
         StrokeLine(BPoint(x, y), BPoint(x + offsetX, y - offsetY));
     }
-    
+
     // draw the center knob
     SetHighColor(knobColor);
     FillEllipse(BPoint(x, y), radius * 0.06, radius * 0.06);