Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 49078100f4
Branches Tags
electron
/
patches
/
chromium
/
fix_aspect_ratio_with_max_size.patch

fix_aspect_ratio_with_max_size.patch 2.2 KB
History Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Cezary Kulakowski <[email protected]>
    3. 

  3. Date: Tue, 11 May 2021 11:14:06 +0200
    4. 

  4. Subject: fix: fix aspect ratio when max width/height is set
    5. 

  5. 

  6. Add the native frame border size to the minimum and maximum size if
    7. 

  7. the view reports its size as the client size. It allows to enlarge
    8. 

  8. window to proper values when aspect ratio and max width/height are
    9. 

  9. set. It also fixes DCHECK which was triggered when user tried to
    10. 

  10. enlarge window above dimensions set during creation of the
    11. 

  11. BrowserWindow.
    12. 

  12. 

  13. diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
    14. 

  14. index ebce632954ae08535eec9565ca4a908f38410daa..5c4719e1f2084f9d1b99f12b614396f68a3903aa 100644
    15. 

  15. --- a/ui/views/win/hwnd_message_handler.cc
    16. 

  16. +++ b/ui/views/win/hwnd_message_handler.cc
    17. 

  17. @@ -3745,15 +3745,30 @@ void HWNDMessageHandler::SizeWindowToAspectRatio(UINT param,
    18. 

  18.    delegate_->GetMinMaxSize(&min_window_size, &max_window_size);
    19. 

  19.    min_window_size = delegate_->DIPToScreenSize(min_window_size);
    20. 

  20.    max_window_size = delegate_->DIPToScreenSize(max_window_size);
    21. 

  21. +  // Add the native frame border size to the minimum and maximum size if the
    22. 

  22. +  // view reports its size as the client size.
    23. 

  23. +  if (delegate_->WidgetSizeIsClientSize()) {
    24. 

  24. +    RECT client_rect, rect;
    25. 

  25. +    GetClientRect(hwnd(), &client_rect);
    26. 

  26. +    GetWindowRect(hwnd(), &rect);
    27. 

  27. +    CR_DEFLATE_RECT(&rect, &client_rect);
    28. 

  28. +    min_window_size.Enlarge(rect.right - rect.left,
    29. 

  29. +                            rect.bottom - rect.top);
    30. 

  30. +    // Either axis may be zero, so enlarge them independently.
    31. 

  31. +    if (max_window_size.width())
    32. 

  32. +      max_window_size.Enlarge(rect.right - rect.left, 0);
    33. 

  33. +    if (max_window_size.height())
    34. 

  34. +      max_window_size.Enlarge(0, rect.bottom - rect.top);
    35. 

  35. +  }
    36. 

  36.  
    37. 

  37.    std::optional<gfx::Size> max_size_param;
    38. 

  38.    if (!max_window_size.IsEmpty()) {
    39. 

  39.      max_size_param = max_window_size;
    40. 

  40.    }
    41. 

  41.  
    42. 

  42. -  gfx::SizeRectToAspectRatioWithExcludedMargin(
    43. 

  43. +  gfx::SizeRectToAspectRatio(
    44. 

  44.        GetWindowResizeEdge(param), aspect_ratio_.value(), min_window_size,
    45. 

  45. -      max_size_param, excluded_margin_, *window_rect);
    46. 

  46. +      max_size_param, window_rect);
    47. 

  47.  }
    48. 

  48.  
    49. 

  49.  POINT HWNDMessageHandler::GetCursorPos() const {
    50.