Better GTK+ Menu color support (#12300)
* Better GTK+ Menu color support * Fix 'invisible menu' issue (#12275) * Now updates menu text color when focus changes! * Better caching of colors when system theme changes * Removed all GTK+ deprecation warnings from menubar * Don't highlight menu text on mouseover in GTK+ * Fix textColor declaration scope error * Simplify FocusManager connection management a bit * Make the linter happy * Decouple MenuBar view recoloring from rebuilding This way we don't need to rebuild the subview each time a recolor is needed, e.g. when window focus changes or the system theme changes * Don't iterate child views if we don't need to * Move variable declaration outside of a loop * More efficient iteration of MenuBar children * Cleaner MenuButton bounds testing * Fix oops * Add a nullptr check in MenuBar::GetItemCount() * Simplify iteration in MenuBar::RebuildChildren() * Make the linter happy * Fix signed-unsigned comparison * Remove declarations of nonexistent methods * Make SubmenuButton accessor const * Cleaner accelerator iteration * Windows fixes
This commit is contained in:
parent
31d688ad3d
commit
558ef7352d
5 changed files with 126 additions and 115 deletions
|
@ -91,7 +91,7 @@ void SubmenuButton::PaintButtonContents(gfx::Canvas* canvas) {
|
|||
|
||||
bool SubmenuButton::GetUnderlinePosition(const base::string16& text,
|
||||
base::char16* accelerator,
|
||||
int* start, int* end) {
|
||||
int* start, int* end) const {
|
||||
int pos, span;
|
||||
base::string16 trimmed = gfx::RemoveAcceleratorChar(text, '&', &pos, &span);
|
||||
if (pos > -1 && span != 0) {
|
||||
|
@ -105,7 +105,7 @@ bool SubmenuButton::GetUnderlinePosition(const base::string16& text,
|
|||
}
|
||||
|
||||
void SubmenuButton::GetCharacterPosition(
|
||||
const base::string16& text, int index, int* pos) {
|
||||
const base::string16& text, int index, int* pos) const {
|
||||
int height = 0;
|
||||
gfx::Canvas::SizeStringInt(text.substr(0, index), gfx::FontList(), pos,
|
||||
&height, 0, 0);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue