Changeset 13540

Timestamp:

Sep 27, 2012, 12:16:21 AM (10 years ago)

Author:

livings124

Message:

fix a bug with the auto-resizing localization code in InfoGeneralViewController?

File:

• trunk/macosx/InfoGeneralViewController.m (modified) (2 diffs)

trunk/macosx/InfoGeneralViewController.m

@@ -60 +60 @@
     NSArray * labels = @[ fPiecesLabel, fHashLabel, fSecureLabel, fCreatorLabel, fDateCreatedLabel, fCommentLabel, fDataLocationLabel ];
     
-    CGFloat oldMaxWidth = 0.0, newMaxWidth = 0.0;
-    NSTextField * oldLongestLabel = nil;
+    CGFloat oldMaxWidth = 0.0, originX, newMaxWidth = 0.0;
     for (NSTextField * label in labels)
     {
-        const CGFloat oldWidth = [label bounds].size.width;
-        if (oldWidth > oldMaxWidth)
+        const CGRect oldFrame = [label frame];
+        if (oldFrame.size.width > oldMaxWidth)
         {
-            oldMaxWidth = oldWidth;
-            oldLongestLabel = label;
+            oldMaxWidth = oldFrame.size.width;
+            originX = oldFrame.origin.x;
         }
         
@@ -80 +79 @@
     {
         NSRect frame = [label frame];
-        frame.origin.x = [oldLongestLabel frame].origin.x;
-        frame.origin.x += newMaxWidth - frame.size.width;
+        frame.origin.x = originX + (newMaxWidth - frame.size.width);
         [label setFrame: frame];
     }