GTK: add back toolbar border....

GTK: add back toolbar border.

BUG=26239
TEST=launch browser, look at border under toolbar, open findbar


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=30522

[Elliot Glaysher, 2009-10-29 21:55:29]

LGTM, but sucks that you need to do this.

On Thu, Oct 29, 2009 at 2:53 PM,  <estade@chromium.org> wrote:
> Reviewers: Elliot Glaysher,
>
> Description:
> GTK: add back toolbar border.
>
> BUG=3D26239
> TEST=3Dlaunch browser, look at border under toolbar, open findbar
>
>
> Please review this at http://codereview.chromium.org/339074
>
> SVN Base: svn://chrome-svn/chrome/trunk/src/
>
> Affected files:
> =A0M =A0 =A0 chrome/browser/gtk/browser_window_gtk.h
> =A0M =A0 =A0 chrome/browser/gtk/browser_window_gtk.cc
>
>
> Index: chrome/browser/gtk/browser_window_gtk.h
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- chrome/browser/gtk/browser_window_gtk.h =A0 =A0 (revision 30478)
> +++ chrome/browser/gtk/browser_window_gtk.h =A0 =A0 (working copy)
> @@ -215,6 +215,9 @@
> =A0 GtkWidget* render_area_vbox_;
> =A0 // EventBox that holds render_area_vbox_.
> =A0 GtkWidget* render_area_event_box_;
> + =A0// Border between toolbar and render area. This is hidden when the f=
ind
> bar
> + =A0// is added because thereafter the findbar will draw the border for =
us.
> + =A0GtkWidget* toolbar_border_;
>
> =A0 scoped_ptr<Browser> browser_;
>
> Index: chrome/browser/gtk/browser_window_gtk.cc
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- chrome/browser/gtk/browser_window_gtk.cc =A0 =A0(revision 30478)
> +++ chrome/browser/gtk/browser_window_gtk.cc =A0 =A0(working copy)
> @@ -1485,6 +1485,8 @@
> =A0 gtk_box_pack_start(GTK_BOX(render_area_vbox_), findbar->widget(),
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0FALSE, FALSE, 0);
> =A0 gtk_box_reorder_child(GTK_BOX(render_area_vbox_), findbar->widget(), =
0);
> +
> + =A0gtk_widget_hide(toolbar_border_);
> =A0}
>
> =A0void BrowserWindowGtk::ResetCustomFrameCursor() {
> @@ -1694,6 +1696,13 @@
> =A0 // |render_area_vbox_| is packed in |render_area_event_box_|.
> =A0 render_area_vbox_ =3D gtk_vbox_new(FALSE, 0);
> =A0 gtk_widget_set_name(render_area_vbox_, "chrome-render-area-vbox");
> +
> + =A0toolbar_border_ =3D gtk_event_box_new();
> + =A0gtk_box_pack_start(GTK_BOX(render_area_vbox_),
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 toolbar_border_, FALSE, FALSE, =
0);
> + =A0gtk_widget_set_size_request(toolbar_border_, -1, 1);
> + =A0gtk_widget_show(toolbar_border_);
> +
> =A0 infobar_container_.reset(new InfoBarContainerGtk(browser_->profile())=
);
> =A0 gtk_box_pack_start(GTK_BOX(render_area_vbox_),
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0infobar_container_->widget(),
> @@ -1812,7 +1821,7 @@
>
> =A0void BrowserWindowGtk::SetBackgroundColor() {
> =A0 Profile* profile =3D browser()->profile();
> - =A0ThemeProvider* theme_provider =3D profile->GetThemeProvider();
> + =A0GtkThemeProvider* theme_provider =3D GtkThemeProvider::GetFrom(profi=
le);
> =A0 int frame_color_id;
> =A0 if (IsActive()) {
> =A0 =A0 frame_color_id =3D browser()->profile()->IsOffTheRecord()
> @@ -1842,6 +1851,9 @@
> =A0 GdkColor frame_prelight_color_gdk =3D
> SkColorToGdkColor(frame_prelight_color);
> =A0 gtk_widget_modify_bg(contents_split_, GTK_STATE_PRELIGHT,
> =A0 =A0 =A0 &frame_prelight_color_gdk);
> +
> + =A0GdkColor border_color =3D theme_provider->GetBorderColor();
> + =A0gtk_widget_modify_bg(toolbar_border_, GTK_STATE_NORMAL, &border_colo=
r);
> =A0}
>
> =A0void BrowserWindowGtk::OnSizeChanged(int width, int height) {
>
>
>

[Evan Stade, 2009-10-29 21:56:31]

agreed