2017-02-22 19:05:27 +01:00
|
|
|
diff --git ui/base/models/menu_model.h ui/base/models/menu_model.h
|
2021-12-16 23:35:54 +01:00
|
|
|
index 11f1421cc79c1..c5dbc643ae7c8 100644
|
2017-02-22 19:05:27 +01:00
|
|
|
--- ui/base/models/menu_model.h
|
|
|
|
+++ ui/base/models/menu_model.h
|
2021-12-16 23:35:54 +01:00
|
|
|
@@ -15,8 +15,11 @@
|
2020-07-08 19:23:29 +02:00
|
|
|
#include "ui/base/models/menu_separator_types.h"
|
2020-06-09 19:48:00 +02:00
|
|
|
#include "ui/gfx/native_widget_types.h"
|
|
|
|
|
|
|
|
+#include "third_party/skia/include/core/SkColor.h"
|
|
|
|
+
|
2017-02-22 19:05:27 +01:00
|
|
|
namespace gfx {
|
|
|
|
class FontList;
|
|
|
|
+class Point;
|
|
|
|
}
|
|
|
|
|
2020-06-09 19:48:00 +02:00
|
|
|
namespace ui {
|
2021-12-16 23:35:54 +01:00
|
|
|
@@ -147,6 +150,27 @@ class COMPONENT_EXPORT(UI_BASE) MenuModel
|
2017-02-22 19:05:27 +01:00
|
|
|
// |event_flags| is a bit mask of ui::EventFlags.
|
|
|
|
virtual void ActivatedAt(int index, int event_flags);
|
|
|
|
|
|
|
|
+ // Called when the user moves the mouse outside the menu and over the owning
|
|
|
|
+ // window.
|
|
|
|
+ virtual void MouseOutsideMenu(const gfx::Point& screen_point) {}
|
|
|
|
+
|
|
|
|
+ // Called on unhandled open/close submenu keyboard commands. |is_rtl| will be
|
|
|
|
+ // true if the menu is displaying a right-to-left language.
|
|
|
|
+ virtual void UnhandledOpenSubmenu(bool is_rtl) {}
|
|
|
|
+ virtual void UnhandledCloseSubmenu(bool is_rtl) {}
|
2017-02-25 06:03:31 +01:00
|
|
|
+
|
|
|
|
+ // Override the text/background color of a given menu item dependent on the
|
2017-03-03 23:37:23 +01:00
|
|
|
+ // |index| and its |is_hovered| state. |is_minor| will be true for accelerator
|
|
|
|
+ // text. Returns true if it chooses to override the color.
|
2017-02-25 06:03:31 +01:00
|
|
|
+ virtual bool GetTextColor(int index,
|
2017-03-03 23:37:23 +01:00
|
|
|
+ bool is_minor,
|
2017-02-25 06:03:31 +01:00
|
|
|
+ bool is_hovered,
|
|
|
|
+ SkColor* override_color) const { return false; }
|
|
|
|
+ virtual bool GetBackgroundColor(int index,
|
|
|
|
+ bool is_hovered,
|
|
|
|
+ SkColor* override_color) const
|
|
|
|
+ { return false; }
|
2017-02-22 19:05:27 +01:00
|
|
|
+
|
|
|
|
// Called when the menu is about to be shown.
|
|
|
|
virtual void MenuWillShow() {}
|
|
|
|
|
2017-02-24 21:01:42 +01:00
|
|
|
diff --git ui/gfx/render_text.cc ui/gfx/render_text.cc
|
2021-10-19 00:17:16 +02:00
|
|
|
index 99120dd6d7fb0..94f2d52787860 100644
|
2017-02-24 21:01:42 +01:00
|
|
|
--- ui/gfx/render_text.cc
|
|
|
|
+++ ui/gfx/render_text.cc
|
2021-07-23 18:40:13 +02:00
|
|
|
@@ -650,6 +650,14 @@ void RenderText::SetWhitespaceElision(absl::optional<bool> whitespace_elision) {
|
2017-02-24 21:01:42 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
+void RenderText::SetDrawStringsFlags(int flags) {
|
|
|
|
+ if (draw_strings_flags_ == flags)
|
|
|
|
+ return;
|
|
|
|
+ draw_strings_flags_ = flags;
|
|
|
|
+ cached_bounds_and_offset_valid_ = false;
|
|
|
|
+ OnTextAttributeChanged();
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
void RenderText::SetDisplayRect(const Rect& r) {
|
|
|
|
if (r != display_rect_) {
|
|
|
|
display_rect_ = r;
|
2021-09-20 11:06:23 +02:00
|
|
|
@@ -1994,6 +2002,19 @@ void RenderText::OnTextAttributeChanged() {
|
2020-02-10 18:10:17 +01:00
|
|
|
|
|
|
|
layout_text_up_to_date_ = false;
|
2017-02-24 21:01:42 +01:00
|
|
|
|
|
|
|
+ if (draw_strings_flags_ != 0) {
|
|
|
|
+ // Compute layout size with the mnemonic character underlined since it might
|
|
|
|
+ // be larger than with the underline hidden.
|
|
|
|
+ int char_pos = -1;
|
|
|
|
+ int char_span = 0;
|
|
|
|
+ layout_text_ =
|
2021-01-28 00:13:12 +01:00
|
|
|
+ gfx::LocateAndRemoveAcceleratorChar(layout_text_, &char_pos, &char_span);
|
2017-02-24 21:01:42 +01:00
|
|
|
+ if (char_pos != -1) {
|
|
|
|
+ gfx::Range range(char_pos, char_pos + char_span);
|
2019-02-01 20:40:18 +01:00
|
|
|
+ styles_[TEXT_STYLE_UNDERLINE].ApplyValue(true, range);
|
2017-02-24 21:01:42 +01:00
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
OnLayoutTextAttributeChanged(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
diff --git ui/gfx/render_text.h ui/gfx/render_text.h
|
2021-12-16 23:35:54 +01:00
|
|
|
index b936fe3ed5196..f878635e34513 100644
|
2017-02-24 21:01:42 +01:00
|
|
|
--- ui/gfx/render_text.h
|
|
|
|
+++ ui/gfx/render_text.h
|
2021-08-20 01:40:49 +02:00
|
|
|
@@ -343,6 +343,10 @@ class GFX_EXPORT RenderText {
|
2019-09-04 17:13:32 +02:00
|
|
|
return whitespace_elision_;
|
|
|
|
}
|
2017-02-24 21:01:42 +01:00
|
|
|
|
|
|
|
+ // Get or set the flags that control display of accelerator characters.
|
|
|
|
+ void SetDrawStringsFlags(int flags);
|
|
|
|
+ int draw_strings_flags() const { return draw_strings_flags_; }
|
|
|
|
+
|
|
|
|
const Rect& display_rect() const { return display_rect_; }
|
|
|
|
void SetDisplayRect(const Rect& r);
|
|
|
|
|
2021-09-20 11:06:23 +02:00
|
|
|
@@ -1052,6 +1056,8 @@ class GFX_EXPORT RenderText {
|
2021-06-04 03:34:56 +02:00
|
|
|
|
2020-03-04 01:29:39 +01:00
|
|
|
// Tell whether or not the |layout_text_| needs an update or is up to date.
|
|
|
|
mutable bool layout_text_up_to_date_ = false;
|
2017-02-24 21:01:42 +01:00
|
|
|
+
|
2021-06-04 03:34:56 +02:00
|
|
|
+ int draw_strings_flags_ = 0;
|
2017-02-24 21:01:42 +01:00
|
|
|
};
|
|
|
|
|
2021-06-04 03:34:56 +02:00
|
|
|
} // namespace gfx
|
2017-05-31 17:33:30 +02:00
|
|
|
diff --git ui/views/animation/ink_drop_host_view.h ui/views/animation/ink_drop_host_view.h
|
2021-12-16 23:35:54 +01:00
|
|
|
index 7de6bdd643ad1..90994f096a0e0 100644
|
2017-05-31 17:33:30 +02:00
|
|
|
--- ui/views/animation/ink_drop_host_view.h
|
|
|
|
+++ ui/views/animation/ink_drop_host_view.h
|
2021-12-16 23:35:54 +01:00
|
|
|
@@ -175,6 +175,8 @@ class VIEWS_EXPORT InkDropHost {
|
2021-06-04 03:34:56 +02:00
|
|
|
View* host_view() { return host_view_; }
|
|
|
|
const View* host_view() const { return host_view_; }
|
2017-05-31 17:33:30 +02:00
|
|
|
|
|
|
|
+ InkDropMode ink_drop_mode() const { return ink_drop_mode_; }
|
|
|
|
+
|
2021-06-04 03:34:56 +02:00
|
|
|
private:
|
|
|
|
friend class test::InkDropHostTestApi;
|
|
|
|
|
2017-02-24 21:01:42 +01:00
|
|
|
diff --git ui/views/controls/button/label_button.cc ui/views/controls/button/label_button.cc
|
2021-10-19 00:17:16 +02:00
|
|
|
index 57e3a7d7e1d8c..eaccdf1cc50cc 100644
|
2017-02-24 21:01:42 +01:00
|
|
|
--- ui/views/controls/button/label_button.cc
|
|
|
|
+++ ui/views/controls/button/label_button.cc
|
2021-10-19 00:17:16 +02:00
|
|
|
@@ -510,6 +510,12 @@ void LabelButton::OnThemeChanged() {
|
2019-07-16 19:59:21 +02:00
|
|
|
SchedulePaint();
|
2017-05-31 17:33:30 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
+void LabelButton::SetFontList(const gfx::FontList& font_list) {
|
|
|
|
+ cached_normal_font_list_ = font_list;
|
2017-08-08 22:10:24 +02:00
|
|
|
+ cached_default_button_font_list_ = font_list;
|
2017-05-31 17:33:30 +02:00
|
|
|
+ label_->SetFontList(cached_normal_font_list_);
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
void LabelButton::StateChanged(ButtonState old_state) {
|
2020-08-29 00:39:23 +02:00
|
|
|
Button::StateChanged(old_state);
|
|
|
|
ResetLabelEnabledColor();
|
2017-05-31 17:33:30 +02:00
|
|
|
diff --git ui/views/controls/button/label_button.h ui/views/controls/button/label_button.h
|
2021-12-16 23:35:54 +01:00
|
|
|
index 75d1292ce4d49..e22a73e3771c4 100644
|
2017-05-31 17:33:30 +02:00
|
|
|
--- ui/views/controls/button/label_button.h
|
|
|
|
+++ ui/views/controls/button/label_button.h
|
2021-12-16 23:35:54 +01:00
|
|
|
@@ -133,6 +133,9 @@ class VIEWS_EXPORT LabelButton : public Button, public NativeThemeDelegate {
|
2019-07-16 19:59:21 +02:00
|
|
|
ui::NativeTheme::State GetForegroundThemeState(
|
|
|
|
ui::NativeTheme::ExtraParams* params) const override;
|
2017-05-31 17:33:30 +02:00
|
|
|
|
|
|
|
+ // Sets the font list used by this button.
|
|
|
|
+ void SetFontList(const gfx::FontList& font_list);
|
|
|
|
+
|
|
|
|
protected:
|
|
|
|
ImageView* image() const { return image_; }
|
2019-07-16 19:59:21 +02:00
|
|
|
Label* label() const { return label_; }
|
2017-02-23 21:24:45 +01:00
|
|
|
diff --git ui/views/controls/label.cc ui/views/controls/label.cc
|
2021-10-19 00:17:16 +02:00
|
|
|
index bb2e1b4412205..493cb05b5c7fa 100644
|
2017-02-23 21:24:45 +01:00
|
|
|
--- ui/views/controls/label.cc
|
|
|
|
+++ ui/views/controls/label.cc
|
2021-10-19 00:17:16 +02:00
|
|
|
@@ -53,12 +53,27 @@ enum LabelPropertyKey {
|
2020-08-29 00:39:23 +02:00
|
|
|
kLabelLineHeight,
|
|
|
|
kLabelObscured,
|
|
|
|
kLabelAllowCharacterBreak,
|
|
|
|
+ kLabelDrawStringsFlags,
|
|
|
|
};
|
|
|
|
|
|
|
|
bool IsOpaque(SkColor color) {
|
2019-09-04 17:13:32 +02:00
|
|
|
return SkColorGetA(color) == SK_AlphaOPAQUE;
|
|
|
|
}
|
2019-01-17 10:56:52 +01:00
|
|
|
|
2017-02-23 21:24:45 +01:00
|
|
|
+// Strips accelerator character prefixes in |text| if needed, based on |flags|.
|
|
|
|
+// Returns a range in |text| to underline or Range::InvalidRange() if
|
|
|
|
+// underlining is not needed.
|
2021-04-21 00:52:34 +02:00
|
|
|
+gfx::Range StripAcceleratorChars(int flags, std::u16string* text) {
|
2017-02-23 21:24:45 +01:00
|
|
|
+ if (flags & (gfx::Canvas::SHOW_PREFIX | gfx::Canvas::HIDE_PREFIX)) {
|
|
|
|
+ int char_pos = -1;
|
|
|
|
+ int char_span = 0;
|
2021-01-28 00:13:12 +01:00
|
|
|
+ *text = gfx::LocateAndRemoveAcceleratorChar(*text, &char_pos, &char_span);
|
2017-02-23 21:24:45 +01:00
|
|
|
+ if ((flags & gfx::Canvas::SHOW_PREFIX) && char_pos != -1)
|
|
|
|
+ return gfx::Range(char_pos, char_pos + char_span);
|
|
|
|
+ }
|
2019-09-04 17:13:32 +02:00
|
|
|
+ return gfx::Range::InvalidRange();
|
2017-02-23 21:24:45 +01:00
|
|
|
+}
|
2019-01-17 10:56:52 +01:00
|
|
|
+
|
2019-09-04 17:13:32 +02:00
|
|
|
} // namespace
|
2019-01-17 10:56:52 +01:00
|
|
|
|
2019-09-04 17:13:32 +02:00
|
|
|
namespace views {
|
2021-10-19 00:17:16 +02:00
|
|
|
@@ -422,6 +437,15 @@ void Label::SetElideBehavior(gfx::ElideBehavior elide_behavior) {
|
2021-04-21 00:52:34 +02:00
|
|
|
OnPropertyChanged(&elide_behavior_, kPropertyEffectsPreferredSizeChanged);
|
2017-02-23 21:24:45 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
+void Label::SetDrawStringsFlags(int flags) {
|
|
|
|
+ if (draw_strings_flags_ == flags)
|
|
|
|
+ return;
|
|
|
|
+ draw_strings_flags_ = flags;
|
2018-02-15 01:12:09 +01:00
|
|
|
+ full_text_->SetDrawStringsFlags(draw_strings_flags_);
|
2020-08-29 00:39:23 +02:00
|
|
|
+ OnPropertyChanged(&full_text_ + kLabelDrawStringsFlags,
|
|
|
|
+ kPropertyEffectsPreferredSizeChanged);
|
2017-02-23 21:24:45 +01:00
|
|
|
+}
|
|
|
|
+
|
2021-04-21 00:52:34 +02:00
|
|
|
std::u16string Label::GetTooltipText() const {
|
|
|
|
return tooltip_text_;
|
|
|
|
}
|
2021-10-19 00:17:16 +02:00
|
|
|
@@ -718,6 +742,16 @@ std::unique_ptr<gfx::RenderText> Label::CreateRenderText() const {
|
2021-01-28 00:13:12 +01:00
|
|
|
render_text->SelectRange(stored_selection_range_);
|
|
|
|
}
|
|
|
|
|
2017-02-23 21:24:45 +01:00
|
|
|
+ if (draw_strings_flags_ != 0) {
|
2021-04-21 00:52:34 +02:00
|
|
|
+ auto text_str = GetText();
|
2017-02-23 21:24:45 +01:00
|
|
|
+ gfx::Range range = StripAcceleratorChars(draw_strings_flags_, &text_str);
|
|
|
|
+ render_text->SetText(text_str);
|
|
|
|
+ if (range.IsValid()) {
|
|
|
|
+ render_text->SetDisplayRect(bounds());
|
2019-02-01 20:40:18 +01:00
|
|
|
+ render_text->ApplyStyle(gfx::TEXT_STYLE_UNDERLINE, true, range);
|
2017-02-23 21:24:45 +01:00
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
2021-01-28 00:13:12 +01:00
|
|
|
return render_text;
|
|
|
|
}
|
|
|
|
|
2017-02-23 21:24:45 +01:00
|
|
|
diff --git ui/views/controls/label.h ui/views/controls/label.h
|
2021-12-16 23:35:54 +01:00
|
|
|
index 1642bff4910d9..34b560bddae57 100644
|
2017-02-23 21:24:45 +01:00
|
|
|
--- ui/views/controls/label.h
|
|
|
|
+++ ui/views/controls/label.h
|
2021-12-16 23:35:54 +01:00
|
|
|
@@ -232,6 +232,10 @@ class VIEWS_EXPORT Label : public View,
|
2019-09-04 17:13:32 +02:00
|
|
|
gfx::ElideBehavior GetElideBehavior() const;
|
2017-02-23 21:24:45 +01:00
|
|
|
void SetElideBehavior(gfx::ElideBehavior elide_behavior);
|
|
|
|
|
|
|
|
+ // Get or set the flags that control display of accelerator characters.
|
|
|
|
+ void SetDrawStringsFlags(int flags);
|
2019-09-04 17:13:32 +02:00
|
|
|
+ int GetDrawStringsFlags() const { return draw_strings_flags_; }
|
2017-02-23 21:24:45 +01:00
|
|
|
+
|
2019-09-04 17:13:32 +02:00
|
|
|
// Gets/Sets the tooltip text. Default behavior for a label (single-line) is
|
|
|
|
// to show the full text if it is wider than its bounds. Calling this
|
|
|
|
// overrides the default behavior and lets you set a custom tooltip. To
|
2021-12-16 23:35:54 +01:00
|
|
|
@@ -478,6 +482,7 @@ class VIEWS_EXPORT Label : public View,
|
2020-03-30 22:13:42 +02:00
|
|
|
int max_width_ = 0;
|
2021-03-04 23:36:57 +01:00
|
|
|
// This is used in single-line mode.
|
|
|
|
int max_width_single_line_ = 0;
|
2017-02-23 21:24:45 +01:00
|
|
|
+ int draw_strings_flags_ = 0;
|
|
|
|
|
2018-03-20 21:15:08 +01:00
|
|
|
std::unique_ptr<SelectionController> selection_controller_;
|
|
|
|
|
2017-02-22 19:05:27 +01:00
|
|
|
diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
|
2021-12-16 23:35:54 +01:00
|
|
|
index 25d5a0cc92b5f..cf85b366d15c8 100644
|
2017-02-22 19:05:27 +01:00
|
|
|
--- ui/views/controls/menu/menu_controller.cc
|
|
|
|
+++ ui/views/controls/menu/menu_controller.cc
|
2021-12-16 23:35:54 +01:00
|
|
|
@@ -2877,8 +2877,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
|
2017-02-22 19:05:27 +01:00
|
|
|
|
|
|
|
void MenuController::OpenSubmenuChangeSelectionIfCan() {
|
|
|
|
MenuItemView* item = pending_state_.item;
|
2019-07-16 19:59:21 +02:00
|
|
|
- if (!item->HasSubmenu() || !item->GetEnabled())
|
|
|
|
+ if (!item->HasSubmenu() || !item->GetEnabled() || !item->GetParentMenuItem()) {
|
2017-02-22 19:05:27 +01:00
|
|
|
+ MenuItemView* submenu_item =
|
|
|
|
+ item->GetParentMenuItem() ? item->GetParentMenuItem() : item;
|
|
|
|
+ submenu_item->GetDelegate()->OnUnhandledOpenSubmenu(submenu_item,
|
|
|
|
+ base::i18n::IsRTL());
|
|
|
|
return;
|
|
|
|
+ }
|
2019-04-16 16:38:48 +02:00
|
|
|
MenuItemView* to_select = nullptr;
|
2019-06-05 16:15:45 +02:00
|
|
|
if (!item->GetSubmenu()->GetMenuItems().empty())
|
2017-02-22 19:05:27 +01:00
|
|
|
to_select = FindInitialSelectableMenuItem(item, INCREMENT_SELECTION_DOWN);
|
2021-12-16 23:35:54 +01:00
|
|
|
@@ -2897,8 +2902,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
|
2017-02-22 19:05:27 +01:00
|
|
|
void MenuController::CloseSubmenu() {
|
|
|
|
MenuItemView* item = state_.item;
|
|
|
|
DCHECK(item);
|
|
|
|
- if (!item->GetParentMenuItem())
|
|
|
|
+ if (!item->GetParentMenuItem()) {
|
|
|
|
+ item->GetDelegate()->OnUnhandledCloseSubmenu(item, base::i18n::IsRTL());
|
|
|
|
return;
|
|
|
|
+ }
|
2017-07-27 01:19:27 +02:00
|
|
|
if (item->SubmenuIsShowing())
|
2017-02-22 19:05:27 +01:00
|
|
|
SetSelection(item, SELECTION_UPDATE_IMMEDIATELY);
|
|
|
|
else if (item->GetParentMenuItem()->GetParentMenuItem())
|
|
|
|
diff --git ui/views/controls/menu/menu_delegate.h ui/views/controls/menu/menu_delegate.h
|
2021-08-20 01:40:49 +02:00
|
|
|
index 9c1542e1f4f0f..548fc8e87d520 100644
|
2017-02-22 19:05:27 +01:00
|
|
|
--- ui/views/controls/menu/menu_delegate.h
|
|
|
|
+++ ui/views/controls/menu/menu_delegate.h
|
2021-08-20 01:40:49 +02:00
|
|
|
@@ -73,6 +73,22 @@ class VIEWS_EXPORT MenuDelegate {
|
|
|
|
virtual const gfx::FontList* GetLabelFontList(int id) const;
|
|
|
|
virtual absl::optional<SkColor> GetLabelColor(int id) const;
|
2017-05-31 17:33:30 +02:00
|
|
|
|
2017-03-03 23:37:23 +01:00
|
|
|
+ // Override the text color of a given menu item dependent on the |command_id|
|
|
|
|
+ // and its |is_hovered| state. |is_minor| will be true for accelerator text.
|
|
|
|
+ // Returns true if it chooses to override the color.
|
|
|
|
+ virtual bool GetTextColor(int command_id,
|
|
|
|
+ bool is_minor,
|
|
|
|
+ bool is_hovered,
|
|
|
|
+ SkColor* override_color) const { return false; }
|
|
|
|
+
|
|
|
|
+ // Override the background color of a given menu item dependent on the
|
2017-02-25 06:03:31 +01:00
|
|
|
+ // |command_id| and its |is_hovered| state. Returns true if it chooses to
|
|
|
|
+ // override the color.
|
2017-03-03 23:37:23 +01:00
|
|
|
+ virtual bool GetBackgroundColor(int command_id,
|
|
|
|
+ bool is_hovered,
|
|
|
|
+ SkColor* override_color) const
|
|
|
|
+ { return false; }
|
2017-05-31 17:33:30 +02:00
|
|
|
+
|
2017-03-03 23:37:23 +01:00
|
|
|
// The tooltip shown for the menu item. This is invoked when the user
|
|
|
|
// hovers over the item, and no tooltip text has been set for that item.
|
2021-04-21 00:52:34 +02:00
|
|
|
virtual std::u16string GetTooltipText(int id,
|
2021-08-20 01:40:49 +02:00
|
|
|
@@ -211,6 +227,11 @@ class VIEWS_EXPORT MenuDelegate {
|
2017-02-22 19:05:27 +01:00
|
|
|
bool* has_mnemonics,
|
|
|
|
MenuButton** button);
|
|
|
|
|
|
|
|
+ // Called on unhandled open/close submenu keyboard commands. |is_rtl| will be
|
|
|
|
+ // true if the menu is displaying a right-to-left language.
|
|
|
|
+ virtual void OnUnhandledOpenSubmenu(MenuItemView* menu, bool is_rtl) {}
|
|
|
|
+ virtual void OnUnhandledCloseSubmenu(MenuItemView* menu, bool is_rtl) {}
|
|
|
|
+
|
|
|
|
// Returns the max width menus can grow to be.
|
|
|
|
virtual int GetMaxWidthForMenu(MenuItemView* menu);
|
|
|
|
|
2017-02-25 06:03:31 +01:00
|
|
|
diff --git ui/views/controls/menu/menu_item_view.cc ui/views/controls/menu/menu_item_view.cc
|
2021-12-16 23:35:54 +01:00
|
|
|
index 51518e199ab63..ce7a13a1fa1cb 100644
|
2017-02-25 06:03:31 +01:00
|
|
|
--- ui/views/controls/menu/menu_item_view.cc
|
|
|
|
+++ ui/views/controls/menu/menu_item_view.cc
|
2021-12-16 23:35:54 +01:00
|
|
|
@@ -1083,6 +1083,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas,
|
2018-11-30 23:21:07 +01:00
|
|
|
spilling_rect.set_y(spilling_rect.y() - corner_radius_);
|
|
|
|
spilling_rect.set_height(spilling_rect.height() + corner_radius_);
|
|
|
|
canvas->DrawRoundRect(spilling_rect, corner_radius_, flags);
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ MenuDelegate *delegate = GetDelegate();
|
2017-03-03 23:37:23 +01:00
|
|
|
+ SkColor override_color;
|
|
|
|
+ if (delegate && delegate->GetBackgroundColor(GetCommand(),
|
2021-10-19 00:17:16 +02:00
|
|
|
+ paint_as_selected,
|
2017-03-03 23:37:23 +01:00
|
|
|
+ &override_color)) {
|
|
|
|
+ canvas->DrawColor(override_color);
|
2021-10-19 00:17:16 +02:00
|
|
|
} else if (paint_as_selected) {
|
2018-11-30 23:21:07 +01:00
|
|
|
gfx::Rect item_bounds = GetLocalBounds();
|
2020-03-04 01:29:39 +01:00
|
|
|
if (type_ == Type::kActionableSubMenu) {
|
2021-12-16 23:35:54 +01:00
|
|
|
@@ -1149,6 +1158,13 @@ void MenuItemView::PaintMinorIconAndText(gfx::Canvas* canvas, SkColor color) {
|
2018-09-04 11:43:21 +02:00
|
|
|
}
|
|
|
|
|
2021-10-19 00:17:16 +02:00
|
|
|
SkColor MenuItemView::GetTextColor(bool minor, bool paint_as_selected) const {
|
2017-02-25 06:03:31 +01:00
|
|
|
+ SkColor text_color;
|
2017-03-03 23:37:23 +01:00
|
|
|
+ const MenuDelegate *delegate = GetDelegate();
|
2021-10-19 00:17:16 +02:00
|
|
|
+ if (delegate && delegate->GetTextColor(GetCommand(), minor, paint_as_selected,
|
2017-03-03 23:37:23 +01:00
|
|
|
+ &text_color)) {
|
|
|
|
+ return text_color;
|
2017-02-25 06:03:31 +01:00
|
|
|
+ }
|
|
|
|
+
|
2019-11-12 17:11:44 +01:00
|
|
|
style::TextContext context =
|
|
|
|
GetMenuController() && GetMenuController()->use_touchable_layout()
|
|
|
|
? style::CONTEXT_TOUCH_MENU
|
2017-02-22 19:05:27 +01:00
|
|
|
diff --git ui/views/controls/menu/menu_model_adapter.cc ui/views/controls/menu/menu_model_adapter.cc
|
2021-08-20 01:40:49 +02:00
|
|
|
index fb5d5e6a79a3f..a336b5a74d6a1 100644
|
2017-02-22 19:05:27 +01:00
|
|
|
--- ui/views/controls/menu/menu_model_adapter.cc
|
|
|
|
+++ ui/views/controls/menu/menu_model_adapter.cc
|
2021-08-20 01:40:49 +02:00
|
|
|
@@ -245,6 +245,77 @@ bool MenuModelAdapter::IsItemChecked(int id) const {
|
2019-02-01 17:42:40 +01:00
|
|
|
return false;
|
2017-02-22 19:05:27 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
+MenuItemView* MenuModelAdapter::GetSiblingMenu(MenuItemView* menu,
|
|
|
|
+ const gfx::Point& screen_point,
|
|
|
|
+ MenuAnchorPosition* anchor,
|
|
|
|
+ bool* has_mnemonics,
|
|
|
|
+ MenuButton** button) {
|
|
|
|
+ // Look up the menu model for this menu.
|
|
|
|
+ const std::map<MenuItemView*, ui::MenuModel*>::const_iterator map_iterator =
|
|
|
|
+ menu_map_.find(menu);
|
|
|
|
+ if (map_iterator != menu_map_.end()) {
|
|
|
|
+ map_iterator->second->MouseOutsideMenu(screen_point);
|
|
|
|
+ return nullptr;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ NOTREACHED();
|
|
|
|
+ return nullptr;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+void MenuModelAdapter::OnUnhandledOpenSubmenu(MenuItemView* menu,
|
|
|
|
+ bool is_rtl) {
|
|
|
|
+ // Look up the menu model for this menu.
|
|
|
|
+ const std::map<MenuItemView*, ui::MenuModel*>::const_iterator map_iterator =
|
|
|
|
+ menu_map_.find(menu);
|
|
|
|
+ if (map_iterator != menu_map_.end()) {
|
|
|
|
+ map_iterator->second->UnhandledOpenSubmenu(is_rtl);
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ NOTREACHED();
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+void MenuModelAdapter::OnUnhandledCloseSubmenu(MenuItemView* menu,
|
|
|
|
+ bool is_rtl) {
|
|
|
|
+ // Look up the menu model for this menu.
|
|
|
|
+ const std::map<MenuItemView*, ui::MenuModel*>::const_iterator map_iterator =
|
|
|
|
+ menu_map_.find(menu);
|
|
|
|
+ if (map_iterator != menu_map_.end()) {
|
|
|
|
+ map_iterator->second->UnhandledCloseSubmenu(is_rtl);
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ NOTREACHED();
|
|
|
|
+}
|
2017-02-25 06:03:31 +01:00
|
|
|
+
|
2017-03-03 23:37:23 +01:00
|
|
|
+bool MenuModelAdapter::GetTextColor(int command_id,
|
|
|
|
+ bool is_minor,
|
|
|
|
+ bool is_hovered,
|
|
|
|
+ SkColor* override_color) const {
|
2017-02-25 06:03:31 +01:00
|
|
|
+ ui::MenuModel* model = menu_model_;
|
|
|
|
+ int index = 0;
|
|
|
|
+ if (ui::MenuModel::GetModelAndIndexForCommandId(command_id, &model, &index))
|
2017-03-03 23:37:23 +01:00
|
|
|
+ return model->GetTextColor(index, is_minor, is_hovered, override_color);
|
2017-02-25 06:03:31 +01:00
|
|
|
+
|
|
|
|
+ NOTREACHED();
|
|
|
|
+ return false;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+bool MenuModelAdapter::GetBackgroundColor(int command_id,
|
|
|
|
+ bool is_hovered,
|
|
|
|
+ SkColor* override_color) const {
|
|
|
|
+ if (command_id == -1)
|
|
|
|
+ return menu_model_->GetBackgroundColor(-1, is_hovered, override_color);
|
|
|
|
+
|
|
|
|
+ ui::MenuModel* model = menu_model_;
|
|
|
|
+ int index = 0;
|
|
|
|
+ if (ui::MenuModel::GetModelAndIndexForCommandId(command_id, &model, &index))
|
|
|
|
+ return model->GetBackgroundColor(index, is_hovered, override_color);
|
|
|
|
+
|
|
|
|
+ NOTREACHED();
|
|
|
|
+ return false;
|
|
|
|
+}
|
2017-02-22 19:05:27 +01:00
|
|
|
+
|
|
|
|
void MenuModelAdapter::WillShowMenu(MenuItemView* menu) {
|
|
|
|
// Look up the menu model for this menu.
|
|
|
|
const std::map<MenuItemView*, ui::MenuModel*>::const_iterator map_iterator =
|
|
|
|
diff --git ui/views/controls/menu/menu_model_adapter.h ui/views/controls/menu/menu_model_adapter.h
|
2021-12-16 23:35:54 +01:00
|
|
|
index b7c7474fb5910..ce3e14071f0c6 100644
|
2017-02-22 19:05:27 +01:00
|
|
|
--- ui/views/controls/menu/menu_model_adapter.h
|
|
|
|
+++ ui/views/controls/menu/menu_model_adapter.h
|
2021-10-19 00:17:16 +02:00
|
|
|
@@ -88,6 +88,20 @@ class VIEWS_EXPORT MenuModelAdapter : public MenuDelegate,
|
2019-02-01 17:42:40 +01:00
|
|
|
bool IsCommandEnabled(int id) const override;
|
2017-02-22 19:05:27 +01:00
|
|
|
bool IsCommandVisible(int id) const override;
|
|
|
|
bool IsItemChecked(int id) const override;
|
|
|
|
+ MenuItemView* GetSiblingMenu(MenuItemView* menu,
|
|
|
|
+ const gfx::Point& screen_point,
|
|
|
|
+ MenuAnchorPosition* anchor,
|
|
|
|
+ bool* has_mnemonics,
|
|
|
|
+ MenuButton** button) override;
|
|
|
|
+ void OnUnhandledOpenSubmenu(MenuItemView* menu, bool is_rtl) override;
|
|
|
|
+ void OnUnhandledCloseSubmenu(MenuItemView* menu, bool is_rtl) override;
|
2017-03-03 23:37:23 +01:00
|
|
|
+ bool GetTextColor(int command_id,
|
|
|
|
+ bool is_minor,
|
|
|
|
+ bool is_hovered,
|
|
|
|
+ SkColor* override_color) const override;
|
2017-02-25 06:03:31 +01:00
|
|
|
+ bool GetBackgroundColor(int command_id,
|
|
|
|
+ bool is_hovered,
|
|
|
|
+ SkColor* override_color) const override;
|
2017-02-22 19:05:27 +01:00
|
|
|
void WillShowMenu(MenuItemView* menu) override;
|
|
|
|
void WillHideMenu(MenuItemView* menu) override;
|
2017-05-31 17:33:30 +02:00
|
|
|
void OnMenuClosed(MenuItemView* menu) override;
|
2017-02-25 06:03:31 +01:00
|
|
|
diff --git ui/views/controls/menu/menu_scroll_view_container.cc ui/views/controls/menu/menu_scroll_view_container.cc
|
2021-12-16 23:35:54 +01:00
|
|
|
index 2375a989af49c..67ffa4aa8fc30 100644
|
2017-02-25 06:03:31 +01:00
|
|
|
--- ui/views/controls/menu/menu_scroll_view_container.cc
|
|
|
|
+++ ui/views/controls/menu/menu_scroll_view_container.cc
|
2021-10-19 00:17:16 +02:00
|
|
|
@@ -239,6 +239,11 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view)
|
2019-11-12 17:11:44 +01:00
|
|
|
scroll_down_button_ =
|
|
|
|
AddChildView(std::make_unique<MenuScrollButton>(content_view, false));
|
2017-02-25 06:03:31 +01:00
|
|
|
|
|
|
|
+ SkColor override_color;
|
|
|
|
+ MenuDelegate* delegate = content_view_->GetMenuItem()->GetDelegate();
|
|
|
|
+ if (delegate && delegate->GetBackgroundColor(-1, false, &override_color))
|
2017-07-27 01:19:27 +02:00
|
|
|
+ SetBackground(views::CreateSolidBackground(override_color));
|
2017-02-25 06:03:31 +01:00
|
|
|
+
|
|
|
|
arrow_ = BubbleBorderTypeFromAnchor(
|
|
|
|
content_view_->GetMenuItem()->GetMenuController()->GetAnchorPosition());
|
|
|
|
|
2017-05-31 17:33:30 +02:00
|
|
|
diff --git ui/views/view.h ui/views/view.h
|
2021-12-16 23:35:54 +01:00
|
|
|
index 211ca9cb8916b..afad4c1a5b29f 100644
|
2017-05-31 17:33:30 +02:00
|
|
|
--- ui/views/view.h
|
|
|
|
+++ ui/views/view.h
|
2021-12-16 23:35:54 +01:00
|
|
|
@@ -22,6 +22,7 @@
|
2020-03-30 22:13:42 +02:00
|
|
|
#include "base/memory/ptr_util.h"
|
2021-12-16 23:35:54 +01:00
|
|
|
#include "base/memory/raw_ptr.h"
|
2021-01-28 00:13:12 +01:00
|
|
|
#include "base/strings/string_piece.h"
|
2017-05-31 17:33:30 +02:00
|
|
|
+#include "base/supports_user_data.h"
|
|
|
|
#include "build/build_config.h"
|
2021-06-04 03:34:56 +02:00
|
|
|
#include "third_party/abseil-cpp/absl/types/optional.h"
|
2019-01-17 10:56:52 +01:00
|
|
|
#include "third_party/skia/include/core/SkPath.h"
|
2021-12-16 23:35:54 +01:00
|
|
|
@@ -270,7 +271,8 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
|
2020-03-30 22:13:42 +02:00
|
|
|
public ui::EventTarget,
|
2017-07-27 01:19:27 +02:00
|
|
|
public ui::EventHandler,
|
2019-06-05 16:15:45 +02:00
|
|
|
public ui::PropertyHandler,
|
2021-06-04 03:34:56 +02:00
|
|
|
- public ui::metadata::MetaDataProvider {
|
|
|
|
+ public ui::metadata::MetaDataProvider,
|
|
|
|
+ public base::SupportsUserData {
|
2017-05-31 17:33:30 +02:00
|
|
|
public:
|
|
|
|
using Views = std::vector<View*>;
|
2021-06-04 03:34:56 +02:00
|
|
|
|