diff options
author | dgozman@chromium.org <dgozman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-04 14:58:22 +0000 |
---|---|---|
committer | dgozman@chromium.org <dgozman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-04 14:58:22 +0000 |
commit | a131afc860e6d841a100878eca59835a751c97c4 (patch) | |
tree | 3f63853ed43b651a31f146d0a0efdc173bfa5be2 /chrome/browser/ui/gtk/browser_window_gtk.cc | |
parent | a76945c1bc3d4e46ca066d88c2c092b8b6925ff6 (diff) | |
download | chromium_src-a131afc860e6d841a100878eca59835a751c97c4.zip chromium_src-a131afc860e6d841a100878eca59835a751c97c4.tar.gz chromium_src-a131afc860e6d841a100878eca59835a751c97c4.tar.bz2 |
[DevTools] Added ChangeAttachedWindowHeight method to allow DevTools to change it's window height from inside.
BUG=171410
TEST=manual.
Review URL: https://chromiumcodereview.appspot.com/12049014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180406 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk/browser_window_gtk.cc')
-rw-r--r-- | chrome/browser/ui/gtk/browser_window_gtk.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc index 378cab1..93300ac 100644 --- a/chrome/browser/ui/gtk/browser_window_gtk.cc +++ b/chrome/browser/ui/gtk/browser_window_gtk.cc @@ -2287,8 +2287,11 @@ void BrowserWindowGtk::UpdateDevToolsForContents(WebContents* contents) { // Fast return in case of the same window having same orientation. if (devtools_window_ == new_devtools_window && (!new_devtools_window || - new_devtools_window->dock_side() == devtools_dock_side_)) + new_devtools_window->dock_side() == devtools_dock_side_)) { + if (new_devtools_window) + UpdateDevToolsSplitPosition(); return; + } // Replace tab contents. if (devtools_window_ != new_devtools_window) { @@ -2361,14 +2364,17 @@ void BrowserWindowGtk::UpdateDevToolsSplitPosition() { return; GtkAllocation contents_rect; gtk_widget_get_allocation(contents_vsplit_, &contents_rect); + int split_size; if (devtools_window_->dock_side() == DEVTOOLS_DOCK_SIDE_RIGHT) { + gtk_widget_style_get(contents_hsplit_, "handle-size", &split_size, NULL); int split_offset = contents_rect.width - - devtools_window_->GetWidth(contents_rect.width); + devtools_window_->GetWidth(contents_rect.width) - split_size; gtk_paned_set_position(GTK_PANED(contents_hsplit_), split_offset); } else { + gtk_widget_style_get(contents_vsplit_, "handle-size", &split_size, NULL); int split_offset = contents_rect.height - - devtools_window_->GetHeight(contents_rect.height); + devtools_window_->GetHeight(contents_rect.height) - split_size; gtk_paned_set_position(GTK_PANED(contents_vsplit_), split_offset); } } |