From: Mitchell Livingston <livings124@transmissionbt.com>
Date: Mon, 29 Oct 2012 22:44:12 +0000 (+0000)
Subject: re-add layout code commented out in r13583
X-Git-Tag: 2.74~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7e2f344ff62618bbcfcf4e0445e907673d00c56f;p=transmission

re-add layout code commented out in r13583
---

diff --git a/macosx/AddMagnetWindowController.m b/macosx/AddMagnetWindowController.m
index 8ab7fbe02..9f7604ace 100644
--- a/macosx/AddMagnetWindowController.m
+++ b/macosx/AddMagnetWindowController.m
@@ -95,8 +95,6 @@
         [fLocationImageView setImage: nil];
     }
     
-    #warning enable after 2.7 
-    /*
     #warning when 10.7-only, switch to auto layout
     [fMagnetLinkLabel sizeToFit];
     
@@ -138,7 +136,6 @@
     const CGFloat minButtonWidth = 82.0;
     const CGFloat oldAddButtonWidth = [fAddButton bounds].size.width;
     const CGFloat oldCancelButtonWidth = [fCancelButton bounds].size.width;
-    #warning add "extra" width that sizeToFit loses
     [fAddButton sizeToFit];
     [fCancelButton sizeToFit];
     NSRect addButtonFrame = [fAddButton frame];
@@ -154,7 +151,6 @@
     [fCancelButton setFrame: cancelButtonFrame];
     
     [fStartCheck sizeToFit];
-     */
 }
 
 - (void) windowDidLoad
diff --git a/macosx/InfoActivityViewController.m b/macosx/InfoActivityViewController.m
index 5fdba6ebf..8d191f3f1 100644
--- a/macosx/InfoActivityViewController.m
+++ b/macosx/InfoActivityViewController.m
@@ -57,8 +57,7 @@
 {
     [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(updatePiecesView) name: @"UpdatePiecesView" object: nil];
     
-    #warning remove when 10.7-only with auto layout
-    /*[fTransferSectionLabel sizeToFit];
+    [fTransferSectionLabel sizeToFit];
     [fDatesSectionLabel sizeToFit];
     [fTimeSectionLabel sizeToFit];
     
@@ -95,7 +94,7 @@
         frame.origin.x += widthIncrease;
         frame.size.width -= widthIncrease;
         [field setFrame: frame];
-    }*/
+    }
 }
 
 - (void) dealloc
diff --git a/macosx/InfoGeneralViewController.m b/macosx/InfoGeneralViewController.m
index 9c97b2aca..cc24ba6fb 100644
--- a/macosx/InfoGeneralViewController.m
+++ b/macosx/InfoGeneralViewController.m
@@ -51,8 +51,6 @@
     [super dealloc];
 }
 
-#warning enable after 2.7
-/*
 - (void) awakeFromNib
 {
     #warning remove when 10.7-only with auto layout
@@ -93,7 +91,7 @@
         frame.size.width -= widthIncrease;
         [field setFrame: frame];
     }
-}*/
+}
 
 - (void) setInfoForTorrents: (NSArray *) torrents
 {
diff --git a/macosx/InfoOptionsViewController.m b/macosx/InfoOptionsViewController.m
index 220115084..e752e269e 100644
--- a/macosx/InfoOptionsViewController.m
+++ b/macosx/InfoOptionsViewController.m
@@ -63,8 +63,6 @@
     [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(setGlobalLabels) name: @"UpdateGlobalOptions" object: nil];
     [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(updateOptionsNotification:) name: @"UpdateOptionsNotification" object: nil];
     
-    #warning enable after 2.7
-    /*
     #warning remove when 10.7-only with auto layout
     const CGFloat padding = 6.0; //this shows as 8 in IB
     [fPrioritySectionLabel sizeToFit];
@@ -130,7 +128,7 @@
     [fPeersConnectLabel sizeToFit];
     NSRect peersConnectLabelFrame = [fPeersConnectLabel frame];
     peersConnectLabelFrame.origin.x = NSMaxX(peersConnectFrame) + padding;
-    [fPeersConnectLabel setFrame: peersConnectLabelFrame];*/
+    [fPeersConnectLabel setFrame: peersConnectLabelFrame];
 }
 
 - (void) dealloc