Pull in fixes for frameless window from upsteam electron

- manually applied: electron/electron@638eae1 - manually applied: https://github.com/electron/electron/pull/9167/files Passes the correct subsystem variable to linker. Before, older Windows version was being used which affected GetSystemMetrics (wrong values returned) Should fix brave/browser-laptop#7641 Should fix brave/browser-laptop#7215 Might fix brave/browser-laptop#5159 Auditors: @bbondy, @bridiver
brave · May 5, 2017 · 5012b72 · 5012b72
1 parent 2906564
commit 5012b72
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 145 deletions.
diff --git a/app/win/BUILD.gn b/app/win/BUILD.gn
@@ -58,7 +58,6 @@ executable("electron_exe") {
   ]
 
   configs -= [ "//build/config/win:console" ]
-  configs += [ "//build/config/win:windowed" ]
 
   data_deps = [
     ":external_binaries",
@@ -133,6 +132,10 @@ executable("electron_exe") {
     "/DELAYLOAD:esent.dll",
     "/DELAYLOAD:API-MS-WIN-CORE-WINRT-L1-1-0.DLL",
     "/DELAYLOAD:API-MS-WIN-CORE-WINRT-STRING-L1-1-0.DLL",
+    # Chrome builds with this minimum environment which makes e.g.
+    # GetSystemMetrics(SM_CXSIZEFRAME) return Windows XP/2003
+    # compatible metrics. See: https://crbug.com/361720
+    "/SUBSYSTEM:WINDOWS,5.02",
   ]
 
   if (is_official_build) {

diff --git a/atom/browser/BUILD.gn b/atom/browser/BUILD.gn
@@ -226,8 +226,6 @@ source_set("browser") {
       "ui/views/menu_bar.h",
       "ui/views/menu_delegate.cc",
       "ui/views/menu_delegate.h",
-      "ui/views/menu_layout.cc",
-      "ui/views/menu_layout.h",
       "ui/views/menu_model_adapter.cc",
       "ui/views/menu_model_adapter.h",
       "ui/views/native_frame_view.cc",

diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc
@@ -8,7 +8,6 @@
 #include <vector>
 
 #include "atom/browser/ui/views/menu_bar.h"
-#include "atom/browser/ui/views/menu_layout.h"
 #include "atom/browser/window_list.h"
 #include "atom/common/color_util.h"
 #include "atom/common/native_mate_converters/image_converter.h"
@@ -287,9 +286,6 @@ NativeWindowViews::NativeWindowViews(
     SetWindowType(GetAcceleratedWidget(), window_type);
 #endif
 
-  // Add web view.
-  SetLayoutManager(new MenuLayout(this, kMenuBarHeight));
-
   AddChildView(web_view_);
 
 #if defined(OS_WIN)
@@ -1278,6 +1274,21 @@ void NativeWindowViews::HandleKeyboardEvent(
   }
 }
 
+void NativeWindowViews::Layout() {
+  const auto size = GetContentsBounds().size();
+  const auto menu_bar_bounds =
+      menu_bar_ ? gfx::Rect(0, 0, size.width(), kMenuBarHeight) : gfx::Rect();
+  if (menu_bar_) {
+    menu_bar_->SetBoundsRect(menu_bar_bounds);
+  }
+
+  if (web_view_) {
+    web_view_->SetBoundsRect(
+        gfx::Rect(0, menu_bar_bounds.height(), size.width(),
+                  size.height() - menu_bar_bounds.height()));
+  }
+}
+
 gfx::Size NativeWindowViews::GetMinimumSize() {
   return NativeWindow::GetMinimumSize();
 }

diff --git a/atom/browser/native_window_views.h b/atom/browser/native_window_views.h
@@ -179,6 +179,7 @@ class NativeWindowViews : public NativeWindow,
       const content::NativeWebKeyboardEvent& event) override;
 
   // views::View:
+  void Layout() override;
   gfx::Size GetMinimumSize() override;
   gfx::Size GetMaximumSize() override;
   bool AcceleratorPressed(const ui::Accelerator& accelerator) override;

diff --git a/atom/browser/ui/views/menu_layout.cc b/atom/browser/ui/views/menu_layout.cc
diff --git a/atom/browser/ui/views/menu_layout.h b/atom/browser/ui/views/menu_layout.h
diff --git a/atom/browser/ui/views/win_frame_view.cc b/atom/browser/ui/views/win_frame_view.cc
@@ -23,7 +23,6 @@ WinFrameView::WinFrameView() {
 WinFrameView::~WinFrameView() {
 }
 
-
 gfx::Rect WinFrameView::GetWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds) const {
   return views::GetWindowBoundsForClientBounds(

diff --git a/atom/browser/ui/win/atom_desktop_window_tree_host_win.cc b/atom/browser/ui/win/atom_desktop_window_tree_host_win.cc
@@ -28,12 +28,4 @@ bool AtomDesktopWindowTreeHostWin::PreHandleMSG(
   return delegate_->PreHandleMSG(message, w_param, l_param, result);
 }
 
-/** Override the client area inset
- *  Returning true forces a border of 0 for frameless windows
- */
-bool AtomDesktopWindowTreeHostWin::GetClientAreaInsets(
-    gfx::Insets* insets) const {
-  return !HasFrame();
-}
-
 }  // namespace atom
diff --git a/atom/browser/ui/win/atom_desktop_window_tree_host_win.h b/atom/browser/ui/win/atom_desktop_window_tree_host_win.h
@@ -27,7 +27,6 @@ class AtomDesktopWindowTreeHostWin : public views::DesktopWindowTreeHostWin {
  protected:
   bool PreHandleMSG(
       UINT message, WPARAM w_param, LPARAM l_param, LRESULT* result) override;
-  bool GetClientAreaInsets(gfx::Insets* insets) const override;
 
  private:
   MessageHandlerDelegate* delegate_;  // weak ref