bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-17 20:50:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge revision 1632 changes:

Browse Source 
- Windows: Don't apply inset to borderless windows (issue #1195).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1750@1633 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2014-03-12 14:37:11 +00:00
parent 8bf0d143b8
commit 804b4255ba
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
patch/patches/views_widget_180.patch
View File

@ -1,6 +1,6 @@
Index: desktop_aura/desktop_root_window_host_win.cc Index: desktop_aura/desktop_root_window_host_win.cc
=================================================================== ===================================================================
--- desktop_aura/desktop_root_window_host_win.cc (revision 247552) --- desktop_aura/desktop_root_window_host_win.cc (revision 252094)
+++ desktop_aura/desktop_root_window_host_win.cc (working copy) +++ desktop_aura/desktop_root_window_host_win.cc (working copy)
@@ -132,7 +132,9 @@ @@ -132,7 +132,9 @@
native_widget_delegate_); native_widget_delegate_);
@ -24,7 +24,7 @@ Index: desktop_aura/desktop_root_window_host_win.cc
Index: desktop_aura/desktop_screen_win.cc Index: desktop_aura/desktop_screen_win.cc
=================================================================== ===================================================================
--- desktop_aura/desktop_screen_win.cc (revision 247552) --- desktop_aura/desktop_screen_win.cc (revision 252094)
+++ desktop_aura/desktop_screen_win.cc (working copy) +++ desktop_aura/desktop_screen_win.cc (working copy)
@@ -54,6 +54,8 @@ @@ -54,6 +54,8 @@
} }
@ -37,7 +37,7 @@ Index: desktop_aura/desktop_screen_win.cc
} }
Index: widget.cc Index: widget.cc
=================================================================== ===================================================================
--- widget.cc (revision 247552) --- widget.cc (revision 252094)
+++ widget.cc (working copy) +++ widget.cc (working copy)
@@ -126,6 +126,7 @@ @@ -126,6 +126,7 @@
show_state(ui::SHOW_STATE_DEFAULT), show_state(ui::SHOW_STATE_DEFAULT),
@ -55,9 +55,23 @@ Index: widget.cc
native_widget(NULL), native_widget(NULL),
desktop_root_window_host(NULL), desktop_root_window_host(NULL),
top_level(false), top_level(false),
@@ -395,7 +397,12 @@
Minimize();
} else if (params.delegate) {
SetContentsView(params.delegate->GetContentsView());
- SetInitialBoundsForFramelessWindow(params.bounds);
+ if (params.parent_widget) {
+ // Set the bounds directly instead of applying an inset.
+ SetBounds(params.bounds);
+ } else {
+ SetInitialBoundsForFramelessWindow(params.bounds);
+ }
}
native_widget_initialized_ = true;
}
Index: widget.h Index: widget.h
=================================================================== ===================================================================
--- widget.h (revision 247552) --- widget.h (revision 252094)
+++ widget.h (working copy) +++ widget.h (working copy)
@@ -201,6 +201,7 @@ @@ -201,6 +201,7 @@
// Should the widget be double buffered? Default is false. // Should the widget be double buffered? Default is false.