diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/gtk/browser_titlebar.cc | 36 | ||||
| -rw-r--r-- | chrome/browser/gtk/location_bar_view_gtk.cc | 15 |
2 files changed, 37 insertions, 14 deletions
diff --git a/chrome/browser/gtk/browser_titlebar.cc b/chrome/browser/gtk/browser_titlebar.cc index 68a4481..c213070d 100644 --- a/chrome/browser/gtk/browser_titlebar.cc +++ b/chrome/browser/gtk/browser_titlebar.cc @@ -83,6 +83,10 @@ const int kButtonSpacing = 2; // Spacing around outside of titlebar buttons. const int kButtonOuterPadding = 2; +// Spacing between tabstrip and window control buttons (when the window is +// maximized). +const int kMaximizedTabstripPadding = 16; + gboolean OnMouseMoveEvent(GtkWidget* widget, GdkEventMotion* event, BrowserWindowGtk* browser_window) { // Reset to the default mouse cursor. @@ -482,20 +486,30 @@ void BrowserTitlebar::UpdateThrobber(TabContents* tab_contents) { void BrowserTitlebar::UpdateTitlebarAlignment() { if (browser_window_->browser()->type() == Browser::TYPE_NORMAL) { - if (using_custom_frame_ && !browser_window_->IsMaximized()) { - gtk_alignment_set_padding(GTK_ALIGNMENT(titlebar_alignment_), - kTitlebarHeight, 0, kTabStripLeftPadding, 0); - } else { - gtk_alignment_set_padding(GTK_ALIGNMENT(titlebar_alignment_), 0, 0, - kTabStripLeftPadding, 0); - } + int top_padding = 0; + int side_padding = 0; + int vertical_offset = kNormalVerticalOffset; if (using_custom_frame_) { - browser_window_->tabstrip()->SetVerticalOffset( - browser_window_->IsMaximized() ? 0 : kNormalVerticalOffset); - } else { - browser_window_->tabstrip()->SetVerticalOffset(kNormalVerticalOffset); + if (!browser_window_->IsMaximized()) { + top_padding = kTitlebarHeight; + } else if (using_custom_frame_ && browser_window_->IsMaximized()) { + vertical_offset = 0; + side_padding = kMaximizedTabstripPadding; + } } + + int right_padding = 0; + int left_padding = kTabStripLeftPadding; + if (titlebar_right_buttons_hbox_) + right_padding = side_padding; + if (titlebar_left_buttons_hbox_) + left_padding = side_padding; + + gtk_alignment_set_padding(GTK_ALIGNMENT(titlebar_alignment_), + top_padding, 0, + left_padding, right_padding); + browser_window_->tabstrip()->SetVerticalOffset(vertical_offset); } else { if (using_custom_frame_ && !browser_window_->IsFullscreen()) { gtk_alignment_set_padding(GTK_ALIGNMENT(titlebar_alignment_), diff --git a/chrome/browser/gtk/location_bar_view_gtk.cc b/chrome/browser/gtk/location_bar_view_gtk.cc index 7882451..601586b 100644 --- a/chrome/browser/gtk/location_bar_view_gtk.cc +++ b/chrome/browser/gtk/location_bar_view_gtk.cc @@ -79,7 +79,10 @@ const int kFirstRunBubbleTopMargin = 5; const int kHboxBorder = 4; // Padding between the elements in the bar. -static const int kInnerPadding = 4; +const int kInnerPadding = 4; + +// Padding between the right of the star and the edge of the URL entry. +const int kStarRightPadding = 2; // Colors used to draw the EV certificate rounded bubble. const GdkColor kEvSecureTextColor = GDK_COLOR_RGB(0x07, 0x95, 0x00); @@ -472,10 +475,16 @@ void LocationBarViewGtk::OnChanged() { } void LocationBarViewGtk::CreateStarButton() { + star_image_ = gtk_image_new(); + + GtkWidget* alignment = gtk_alignment_new(0, 0, 1, 1); + gtk_alignment_set_padding(GTK_ALIGNMENT(alignment), 0, 0, + 0, kStarRightPadding); + gtk_container_add(GTK_CONTAINER(alignment), star_image_); + star_.Own(gtk_event_box_new()); gtk_event_box_set_visible_window(GTK_EVENT_BOX(star_.get()), FALSE); - star_image_ = gtk_image_new(); - gtk_container_add(GTK_CONTAINER(star_.get()), star_image_); + gtk_container_add(GTK_CONTAINER(star_.get()), alignment); gtk_widget_show_all(star_.get()); ViewIDUtil::SetID(star_.get(), VIEW_ID_STAR_BUTTON); |