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

Unified Diff: chrome/browser/ui/panels/panel_browser_view.cc

Issue 7537030: Make panel adjust bounds per preferred size change notification on Windows. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 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
Index: chrome/browser/ui/panels/panel_browser_view.cc
===================================================================
--- chrome/browser/ui/panels/panel_browser_view.cc (revision 98900)
+++ chrome/browser/ui/panels/panel_browser_view.cc (working copy)
@@ -37,7 +37,7 @@
: BrowserView(browser),
panel_(panel),
bounds_(bounds),
- original_height_(bounds.height()),
+ restored_height_(bounds.height()),
closed_(false),
focused_(false),
mouse_pressed_(false),
@@ -82,8 +82,13 @@
}
void PanelBrowserView::SetBounds(const gfx::Rect& bounds) {
+ if (bounds_ == bounds)
+ return;
bounds_ = bounds;
+ if (panel_->expansion_state() == Panel::EXPANDED)
+ restored_height_ = bounds.height();
+
// No animation if the panel is being dragged.
if (mouse_dragging_) {
::BrowserView::SetBounds(bounds);
@@ -187,7 +192,7 @@
int height;
switch (expansion_state) {
case Panel::EXPANDED:
- height = original_height_;
+ height = restored_height_;
break;
case Panel::TITLE_ONLY:
height = GetFrameView()->NonClientTopBorderHeight();
@@ -203,7 +208,7 @@
break;
default:
NOTREACHED();
- height = original_height_;
+ height = restored_height_;
break;
}
@@ -311,6 +316,18 @@
HandleKeyboardEvent(event);
}
+gfx::Size PanelBrowserView::GetNonClientAreaExtent() const {
+ return GetFrameView()->NonClientAreaSize();
+}
+
+int PanelBrowserView::GetRestoredHeight() const {
+ return restored_height_;
+}
+
+void PanelBrowserView::SetRestoredHeight(int height) {
+ restored_height_ = height;
+}
+
Browser* PanelBrowserView::GetPanelBrowser() const {
return browser();
}
« no previous file with comments | « chrome/browser/ui/panels/panel_browser_view.h ('k') | chrome/browser/ui/panels/panel_browser_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698