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

Side by Side Diff: ui/views/win/hwnd_message_handler.cc

Issue 2105643002: Fix a regression caused by the background fullscreen handling code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2743
Patch Set: Created 4 years, 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "ui/views/win/hwnd_message_handler.h" 5 #include "ui/views/win/hwnd_message_handler.h"
6 6
7 #include <dwmapi.h> 7 #include <dwmapi.h>
8 #include <oleacc.h> 8 #include <oleacc.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #include <tchar.h> 10 #include <tchar.h>
(...skipping 1096 matching lines...) Expand 10 before | Expand all | Expand 10 after
1107 tme.dwHoverTime = 0; 1107 tme.dwHoverTime = 0;
1108 TrackMouseEvent(&tme); 1108 TrackMouseEvent(&tme);
1109 } else if (mouse_tracking_flags != active_mouse_tracking_flags_) { 1109 } else if (mouse_tracking_flags != active_mouse_tracking_flags_) {
1110 TrackMouseEvents(active_mouse_tracking_flags_ | TME_CANCEL); 1110 TrackMouseEvents(active_mouse_tracking_flags_ | TME_CANCEL);
1111 TrackMouseEvents(mouse_tracking_flags); 1111 TrackMouseEvents(mouse_tracking_flags);
1112 } 1112 }
1113 } 1113 }
1114 1114
1115 void HWNDMessageHandler::ClientAreaSizeChanged() { 1115 void HWNDMessageHandler::ClientAreaSizeChanged() {
1116 // Ignore size changes due to fullscreen windows losing activation. 1116 // Ignore size changes due to fullscreen windows losing activation.
1117 if (background_fullscreen_hack_) 1117 if (background_fullscreen_hack_ && !sent_window_size_changing_)
1118 return; 1118 return;
1119 gfx::Size s = GetClientAreaBounds().size(); 1119 gfx::Size s = GetClientAreaBounds().size();
1120 delegate_->HandleClientSizeChanged(s); 1120 delegate_->HandleClientSizeChanged(s);
1121 } 1121 }
1122 1122
1123 bool HWNDMessageHandler::GetClientAreaInsets(gfx::Insets* insets) const { 1123 bool HWNDMessageHandler::GetClientAreaInsets(gfx::Insets* insets) const {
1124 if (delegate_->GetClientAreaInsets(insets)) 1124 if (delegate_->GetClientAreaInsets(insets))
1125 return true; 1125 return true;
1126 DCHECK(insets->IsEmpty()); 1126 DCHECK(insets->IsEmpty());
1127 1127
(...skipping 1612 matching lines...) Expand 10 before | Expand all | Expand 10 after
2740 MONITORINFO monitor_info = {sizeof(monitor_info)}; 2740 MONITORINFO monitor_info = {sizeof(monitor_info)};
2741 GetMonitorInfo(MonitorFromWindow(hwnd(), MONITOR_DEFAULTTOPRIMARY), 2741 GetMonitorInfo(MonitorFromWindow(hwnd(), MONITOR_DEFAULTTOPRIMARY),
2742 &monitor_info); 2742 &monitor_info);
2743 gfx::Rect shrunk_rect(monitor_info.rcMonitor); 2743 gfx::Rect shrunk_rect(monitor_info.rcMonitor);
2744 shrunk_rect.set_height(shrunk_rect.height() - 1); 2744 shrunk_rect.set_height(shrunk_rect.height() - 1);
2745 background_fullscreen_hack_ = true; 2745 background_fullscreen_hack_ = true;
2746 SetBoundsInternal(shrunk_rect, false); 2746 SetBoundsInternal(shrunk_rect, false);
2747 } 2747 }
2748 2748
2749 } // namespace views 2749 } // namespace views
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698