Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7048)

Unified Diff: chrome/browser/ui/views/toolbar_view.cc

Issue 10907038: alternate ntp: clip middle omnibox when resizing browser window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed scott's comments Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/location_bar/location_bar_container_aura.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/toolbar_view.cc
diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc
index 3df545aa5da95e3732462070ec3b71b0b2b1997c..f2164cc786b0ca4f5fe685949952b7997be55c78 100644
--- a/chrome/browser/ui/views/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar_view.cc
@@ -423,7 +423,17 @@ void ToolbarView::LayoutForSearch() {
location_bar_container_->SetInToolbar(false);
location_container_bounds.set_height(
location_bar_container_->GetPreferredSize().height());
- location_bar_container_->SetBoundsRect(location_container_bounds);
+
+ // If bounds of |location_bar_container_| is not contained within its
+ // parent's, adjust the former's to within the latter's. This will clip its
+ // child |location_bar_view_| within its bounds without resizing it.
+ // Note that parent of |location_bar_container_| i.e. BrowserView can't clip
+ // its children, else it loses the 3D shadows.
+ gfx::Rect parent_rect = location_bar_container_->parent()->GetLocalBounds();
+ gfx::Rect intersect_rect = parent_rect.Intersect(location_container_bounds);
+ // If the two bounds don't intersect, set bounds of |location_bar_container_|
+ // to 0.
+ location_bar_container_->SetBoundsRect(intersect_rect);
#endif
}
@@ -978,7 +988,7 @@ void ToolbarView::SetLocationBarContainerBounds(
// LocationBarContainer is not a child of the ToolbarView.
gfx::Point origin(bounds.origin());
views::View::ConvertPointToTarget(this, location_bar_container_->parent(),
- &origin);
+ &origin);
gfx::Rect target_bounds(origin, bounds.size());
if (location_bar_container_->GetTargetBounds() != target_bounds) {
location_bar_container_->SetInToolbar(true);
« no previous file with comments | « chrome/browser/ui/views/location_bar/location_bar_container_aura.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698