summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/find_bar_cocoa_controller.mm
diff options
context:
space:
mode:
authorrohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-27 20:25:59 +0000
committerrohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-27 20:25:59 +0000
commit987d3f969bde97b121b4144a980394ee777663b7 (patch)
tree53943f2ffd567ecc615121b5714abd7ef9169edd /chrome/browser/cocoa/find_bar_cocoa_controller.mm
parentae23c272faf85d4cf779ae15d28fc59f5a8162ab (diff)
downloadchromium_src-987d3f969bde97b121b4144a980394ee777663b7.zip
chromium_src-987d3f969bde97b121b4144a980394ee777663b7.tar.gz
chromium_src-987d3f969bde97b121b4144a980394ee777663b7.tar.bz2
Pretties up the FindBar on Mac.
BUG=http://crbug.com/14903 BUG=http://crbug.com/14904 BUG=http://crbug.com/14905 TEST=Findbar should function normally, as before. Review URL: http://codereview.chromium.org/160144 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21686 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/find_bar_cocoa_controller.mm')
-rw-r--r--chrome/browser/cocoa/find_bar_cocoa_controller.mm12
1 files changed, 12 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/find_bar_cocoa_controller.mm b/chrome/browser/cocoa/find_bar_cocoa_controller.mm
index 58e687c..f28fd56 100644
--- a/chrome/browser/cocoa/find_bar_cocoa_controller.mm
+++ b/chrome/browser/cocoa/find_bar_cocoa_controller.mm
@@ -168,6 +168,18 @@
// area.
[resultsLabel_ setStringValue:@""];
}
+
+ // Resize |resultsLabel_| to completely contain its string and right-justify
+ // it within |findText_|. sizeToFit may shrink the frame vertically, which we
+ // don't want, so we save the original vertical positioning.
+ NSRect labelFrame = [resultsLabel_ frame];
+ [resultsLabel_ sizeToFit];
+ labelFrame.size.width = [resultsLabel_ frame].size.width;
+ labelFrame.origin.x = NSMaxX([findText_ frame]) - labelFrame.size.width;
+ [resultsLabel_ setFrame:labelFrame];
+
+ // TODO(rohitrao): If the search string is too long, then it will overlap with
+ // the results label. Fix.
}
- (BOOL)isFindBarVisible {