bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Windows: Fix behavior of frameless windows with Views.

Browse Source 
- Don't set InitParams::TRANSLUCENT_WINDOW. Setting this resulted in
  the WS_EX_COMPOSITED style being added and the WS_THICKFRAME style
  being removed, which disabled Aero Snap.
- Remove the non-client border to get a completely frameless window.
  Having a border is problematic because the top is drawn by Windows
  while the rest is drawn black. Having Windows draw part of the
  border is required to enable the window drop shadow (see
  HWNDMessageHandler::SetDwmFrameExtension).
- Delete the remove_caption patches which are no longer required.
This commit is contained in:
Marshall Greenblatt
2016-12-14 05:27:10 -08:00
parent 48908c9195
commit 9928036f63
2 changed files with 21 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
libcef/browser/views/window_view.cc
View File

@@ -96,16 +96,11 @@ class NativeFrameViewEx : public views::NativeFrameView {
DISALLOW_COPY_AND_ASSIGN(NativeFrameViewEx);
};
// The visible edge around the content area inside the frame border. Necessary
// to resize when there are controls that handle mouse events at the edge of the
// client area. Only used in restored mode.
const int kNonClientBorderThickness = 1;
// The area inside the frame border that can be clicked and dragged for resizing
// the window. Only used in restored mode.
const int kResizeBorderThickness = 4;
// The distance from each window corner that triggers diaginal resizing. Only
// The distance from each window corner that triggers diagonal resizing. Only
// used in restored mode.
const int kResizeAreaCornerSize = 16;
@@ -125,11 +120,7 @@ class CaptionlessFrameView : public views::NonClientFrameView {
gfx::Rect GetWindowBoundsForClientBounds(
const gfx::Rect& client_bounds) const override {
int border_thickness = NonClientBorderThickness();
return gfx::Rect(client_bounds.x() - border_thickness,
client_bounds.y() - border_thickness,
client_bounds.width() + (2 * border_thickness),
client_bounds.height() + (2 * border_thickness));
return client_bounds;
}
int NonClientHitTest(const gfx::Point& point) override {
@@ -195,10 +186,7 @@ class CaptionlessFrameView : public views::NonClientFrameView {
}
void Layout() override {
int border_thickness = NonClientBorderThickness();
client_view_bounds_.SetRect(border_thickness, border_thickness,
std::max(0, width() - (2 * border_thickness)),
std::max(0, height() - (2 * border_thickness)));
client_view_bounds_.SetRect(0, 0, width(), height());
}
gfx::Size GetPreferredSize() const override {
@@ -221,11 +209,6 @@ class CaptionlessFrameView : public views::NonClientFrameView {
}
private:
int NonClientBorderThickness() const {
return (widget_->IsMaximized() || widget_->IsFullscreen() ?
0 : kNonClientBorderThickness);
}
int ResizeBorderThickness() const {
return (widget_->IsMaximized() || widget_->IsFullscreen() ?
0 : kResizeBorderThickness);
@@ -264,12 +247,14 @@ void CefWindowView::CreateWidget() {
if (cef_delegate())
is_frameless_ = cef_delegate()->IsFrameless(GetCefWindow());
#if defined(OS_WIN)
if (is_frameless_) {
// Don't show the native window caption but keep a resizable border.
params.remove_caption = true;
// Remove the black opaque background that's displayed by default.
params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
// Don't show the native window caption. Setting this value on Linux will
// result in window resize artifacts.
params.remove_standard_frame = true;
}
#endif
widget->Init(params);