OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/gtk/browser_window_gtk.h" | 5 #include "chrome/browser/ui/gtk/browser_window_gtk.h" |
6 | 6 |
7 #include <gdk/gdkkeysyms.h> | 7 #include <gdk/gdkkeysyms.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <string> | 10 #include <string> |
(...skipping 2294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2305 | 2305 |
2306 if (should_show) { | 2306 if (should_show) { |
2307 devtools_dock_side_ = new_devtools_window->dock_side(); | 2307 devtools_dock_side_ = new_devtools_window->dock_side(); |
2308 ShowDevToolsContainer(); | 2308 ShowDevToolsContainer(); |
2309 } else if (new_devtools_window) { | 2309 } else if (new_devtools_window) { |
2310 UpdateDevToolsSplitPosition(); | 2310 UpdateDevToolsSplitPosition(); |
2311 } | 2311 } |
2312 } | 2312 } |
2313 | 2313 |
2314 void BrowserWindowGtk::ShowDevToolsContainer() { | 2314 void BrowserWindowGtk::ShowDevToolsContainer() { |
| 2315 gtk_widget_set_size_request(devtools_container_->widget(), |
| 2316 devtools_window_->GetMinimumWidth(), |
| 2317 devtools_window_->GetMinimumHeight()); |
2315 bool to_right = devtools_dock_side_ == DEVTOOLS_DOCK_SIDE_RIGHT; | 2318 bool to_right = devtools_dock_side_ == DEVTOOLS_DOCK_SIDE_RIGHT; |
2316 gtk_paned_pack2(GTK_PANED(to_right ? contents_hsplit_ : contents_vsplit_), | 2319 gtk_paned_pack2(GTK_PANED(to_right ? contents_hsplit_ : contents_vsplit_), |
2317 devtools_container_->widget(), | 2320 devtools_container_->widget(), |
2318 FALSE, | 2321 FALSE, |
2319 TRUE); | 2322 FALSE); |
2320 UpdateDevToolsSplitPosition(); | 2323 UpdateDevToolsSplitPosition(); |
2321 gtk_widget_show(devtools_container_->widget()); | 2324 gtk_widget_show(devtools_container_->widget()); |
2322 } | 2325 } |
2323 | 2326 |
2324 void BrowserWindowGtk::HideDevToolsContainer() { | 2327 void BrowserWindowGtk::HideDevToolsContainer() { |
2325 bool to_right = devtools_dock_side_ == DEVTOOLS_DOCK_SIDE_RIGHT; | 2328 bool to_right = devtools_dock_side_ == DEVTOOLS_DOCK_SIDE_RIGHT; |
2326 gtk_container_remove(GTK_CONTAINER(to_right ? contents_hsplit_ : | 2329 gtk_container_remove(GTK_CONTAINER(to_right ? contents_hsplit_ : |
2327 contents_vsplit_), | 2330 contents_vsplit_), |
2328 devtools_container_->widget()); | 2331 devtools_container_->widget()); |
2329 } | 2332 } |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2375 wm_type == ui::WM_OPENBOX || | 2378 wm_type == ui::WM_OPENBOX || |
2376 wm_type == ui::WM_XFWM4); | 2379 wm_type == ui::WM_XFWM4); |
2377 } | 2380 } |
2378 | 2381 |
2379 // static | 2382 // static |
2380 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { | 2383 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { |
2381 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); | 2384 BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser); |
2382 browser_window_gtk->Init(); | 2385 browser_window_gtk->Init(); |
2383 return browser_window_gtk; | 2386 return browser_window_gtk; |
2384 } | 2387 } |
OLD | NEW |