diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-10 03:36:56 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-10 03:36:56 +0000 |
commit | 1d8e0549671de50700c47fbb9418b59569f61966 (patch) | |
tree | 7df6a2c85ea77638174b67f972592e091a507de8 /chrome/browser/views/frame/browser_frame_win.cc | |
parent | 3e4f1bc651d4a2027a19c572b352f7ba4e2c3c92 (diff) | |
download | chromium_src-1d8e0549671de50700c47fbb9418b59569f61966.zip chromium_src-1d8e0549671de50700c47fbb9418b59569f61966.tar.gz chromium_src-1d8e0549671de50700c47fbb9418b59569f61966.tar.bz2 |
1. Correct shapes for side tabs.
2. Adjust transparency of background tabs a little.
3. Implement loading animation for side tabs.
4. Deeper shadow for side tabstrip between browser view and side tabstrip.
http://crbug.com/34509
TEST=none
Review URL: http://codereview.chromium.org/610002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41125 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/frame/browser_frame_win.cc')
-rw-r--r-- | chrome/browser/views/frame/browser_frame_win.cc | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/chrome/browser/views/frame/browser_frame_win.cc b/chrome/browser/views/frame/browser_frame_win.cc index 8c51c8a..696e109 100644 --- a/chrome/browser/views/frame/browser_frame_win.cc +++ b/chrome/browser/views/frame/browser_frame_win.cc @@ -123,6 +123,10 @@ views::View* BrowserFrameWin::GetFrameView() const { return browser_frame_view_; } +void BrowserFrameWin::PaintTabStripShadow(gfx::Canvas* canvas) { + browser_frame_view_->PaintTabStripShadow(canvas); +} + /////////////////////////////////////////////////////////////////////////////// // BrowserFrame, views::WindowWin overrides: @@ -293,8 +297,7 @@ void BrowserFrameWin::UpdateDWMFrame() { if (browser_view_->UsingSideTabs()) { margins.cxLeftWidth += GetBoundsForTabStrip(browser_view_->tabstrip()).right(); - margins.cyTopHeight += - GetSystemMetrics(SM_CYSIZEFRAME) + GetSystemMetrics(SM_CYCAPTION); + margins.cyTopHeight += GetSystemMetrics(SM_CYSIZEFRAME); } else { margins.cyTopHeight = GetBoundsForTabStrip(browser_view_->tabstrip()).bottom(); @@ -304,4 +307,13 @@ void BrowserFrameWin::UpdateDWMFrame() { // For popup and app windows we want to use the default margins. } DwmExtendFrameIntoClientArea(GetNativeView(), &margins); + + DWORD window_style = GetWindowLong(GWL_STYLE); + if (browser_view_->UsingSideTabs()) { + if (window_style & WS_CAPTION) + SetWindowLong(GWL_STYLE, window_style & ~WS_CAPTION); + } else { + if (!(window_style & WS_CAPTION)) + SetWindowLong(GWL_STYLE, window_style | WS_CAPTION); + } } |