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

allow_setting_secondary_label_via_simplemenumodel.patch 3.8 KB
History Raw

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

  2. From: deepak1556 <[email protected]>
    3. 

  3. Date: Thu, 21 May 2020 13:58:01 -0700
    4. 

  4. Subject: Allow setting secondary label via SimpleMenuModel
    5. 

  5. 

  6. Builds on https://chromium-review.googlesource.com/c/chromium/src/+/2208976
    7. 

  7. 

  8. diff --git a/ui/menus/simple_menu_model.cc b/ui/menus/simple_menu_model.cc
    9. 

  9. index 9f56505d9502c685f66ab082b60eaae4011e76b7..35ee633305f6dd5910e1c19dcc8c9df064757c57 100644
    10. 

  10. --- a/ui/menus/simple_menu_model.cc
    11. 

  11. +++ b/ui/menus/simple_menu_model.cc
    12. 

  12. @@ -54,6 +54,11 @@ std::u16string SimpleMenuModel::Delegate::GetLabelForCommandId(
    13. 

  13.    return std::u16string();
    14. 

  14.  }
    15. 

  15.  
    16. 

  16. +std::u16string SimpleMenuModel::Delegate::GetSecondaryLabelForCommandId(
    17. 

  17. +    int command_id) const {
    18. 

  18. +  return std::u16string();
    19. 

  19. +}
    20. 

  20. +
    21. 

  21.  ImageModel SimpleMenuModel::Delegate::GetIconForCommandId(
    22. 

  22.      int command_id) const {
    23. 

  23.    return ImageModel();
    24. 

  24. @@ -347,6 +352,11 @@ void SimpleMenuModel::SetAcceleratorAt(size_t index,
    25. 

  25.    MenuItemsChanged();
    26. 

  26.  }
    27. 

  27.  
    28. 

  28. +void SimpleMenuModel::SetSecondaryLabel(size_t index, const std::u16string& secondary_label) {
    29. 

  29. +  items_[ValidateItemIndex(index)].secondary_label = secondary_label;
    30. 

  30. +  MenuItemsChanged();
    31. 

  31. +}
    32. 

  32. +
    33. 

  33.  void SimpleMenuModel::SetMinorText(size_t index,
    34. 

  34.                                     const std::u16string& minor_text) {
    35. 

  35.    items_[ValidateItemIndex(index)].minor_text = minor_text;
    36. 

  36. @@ -453,6 +463,12 @@ std::u16string SimpleMenuModel::GetLabelAt(size_t index) const {
    37. 

  37.    return items_[ValidateItemIndex(index)].label;
    38. 

  38.  }
    39. 

  39.  
    40. 

  40. +std::u16string SimpleMenuModel::GetSecondaryLabelAt(size_t index) const {
    41. 

  41. +  if (IsItemDynamicAt(index))
    42. 

  42. +    return delegate_->GetSecondaryLabelForCommandId(GetCommandIdAt(index));
    43. 

  43. +  return items_[ValidateItemIndex(index)].secondary_label;
    44. 

  44. +}
    45. 

  45. +
    46. 

  46.  std::u16string SimpleMenuModel::GetMinorTextAt(size_t index) const {
    47. 

  47.    return items_[ValidateItemIndex(index)].minor_text;
    48. 

  48.  }
    49. 

  49. diff --git a/ui/menus/simple_menu_model.h b/ui/menus/simple_menu_model.h
    50. 

  50. index 596663d62632e4331f8aad421298d1fcdc9ab05e..469778f0c13e6d3fd30023af9b19c4a4cb7969be 100644
    51. 

  51. --- a/ui/menus/simple_menu_model.h
    52. 

  52. +++ b/ui/menus/simple_menu_model.h
    53. 

  53. @@ -99,6 +99,7 @@ class COMPONENT_EXPORT(UI_MENUS) SimpleMenuModel : public MenuModel {
    54. 

  54.      // Some command ids have labels and icons that change over time.
    55. 

  55.      virtual bool IsItemForCommandIdDynamic(int command_id) const;
    56. 

  56.      virtual std::u16string GetLabelForCommandId(int command_id) const;
    57. 

  57. +    virtual std::u16string GetSecondaryLabelForCommandId(int command_id) const;
    58. 

  58.      // Gets the icon for the item with the specified id.
    59. 

  59.      virtual ImageModel GetIconForCommandId(int command_id) const;
    60. 

  60.  
    61. 

  61. @@ -224,6 +225,9 @@ class COMPONENT_EXPORT(UI_MENUS) SimpleMenuModel : public MenuModel {
    62. 

  62.    // former is set).
    63. 

  63.    void SetAcceleratorAt(size_t index, const ui::Accelerator& accelerator);
    64. 

  64.  
    65. 

  65. +  // Sets the secondary_label for the item at |index|.
    66. 

  66. +  void SetSecondaryLabel(size_t index, const std::u16string& secondary_label);
    67. 

  67. +
    68. 

  68.    // Sets the minor text for the item at |index|.
    69. 

  69.    void SetMinorText(size_t index, const std::u16string& minor_text);
    70. 

  70.  
    71. 

  71. @@ -274,6 +278,7 @@ class COMPONENT_EXPORT(UI_MENUS) SimpleMenuModel : public MenuModel {
    72. 

  72.    ui::MenuSeparatorType GetSeparatorTypeAt(size_t index) const override;
    73. 

  73.    int GetCommandIdAt(size_t index) const override;
    74. 

  74.    std::u16string GetLabelAt(size_t index) const override;
    75. 

  75. +  std::u16string GetSecondaryLabelAt(size_t index) const override;
    76. 

  76.    std::u16string GetMinorTextAt(size_t index) const override;
    77. 

  77.    ImageModel GetMinorIconAt(size_t index) const override;
    78. 

  78.    bool IsItemDynamicAt(size_t index) const override;
    79. 

  79. @@ -321,6 +326,7 @@ class COMPONENT_EXPORT(UI_MENUS) SimpleMenuModel : public MenuModel {
    80. 

  80.      ItemType type = TYPE_COMMAND;
    81. 

  81.      std::u16string label;
    82. 

  82.      ui::Accelerator accelerator;
    83. 

  83. +    std::u16string secondary_label;
    84. 

  84.      std::u16string minor_text;
    85. 

  85.      ImageModel minor_icon;
    86. 

  86.      ImageModel icon;
    87.