diff options
author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-08 00:10:41 +0000 |
---|---|---|
committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-08 00:10:41 +0000 |
commit | 74e80ae59473d03bd5a5c610a9c5c4416e944012 (patch) | |
tree | 74ab1ac5f824892d2395019902f13bd65a3db430 /chrome/browser/gtk/menu_gtk.h | |
parent | d6c8eb0d48e0dbd8976fc03d2bb2f4fa43036f9d (diff) | |
download | chromium_src-74e80ae59473d03bd5a5c610a9c5c4416e944012.zip chromium_src-74e80ae59473d03bd5a5c610a9c5c4416e944012.tar.gz chromium_src-74e80ae59473d03bd5a5c610a9c5c4416e944012.tar.bz2 |
GTK: Fix highlight and image colors in the new wrench menu.
- The states weren't being set properly to replicate the menu item
highlight effect. The button background needs to be STATE_SELECTED
while the actual widget needs PRELIGHT. This removes a bunch of
crud.
- The fullscreen button needs to be tinted multiple times to the
different label states. Now the fullscreen icon is the correct
label color. Required adding infrastructure for GtkIconSets.
BUG=45757
TEST=All labels and images in buttons should match the normal and
prelight states of the labels in normal menu items. Make sure to
try themes that have different normal and prelight states (DarkLooks)
and themes that have the same color (Ambiance).
Review URL: http://codereview.chromium.org/2864044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51805 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/menu_gtk.h')
-rw-r--r-- | chrome/browser/gtk/menu_gtk.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/gtk/menu_gtk.h b/chrome/browser/gtk/menu_gtk.h index 721b736..55767da 100644 --- a/chrome/browser/gtk/menu_gtk.h +++ b/chrome/browser/gtk/menu_gtk.h @@ -42,6 +42,9 @@ class MenuGtk { // Return true if we should override the "gtk-menu-images" system setting // when showing image menu items for this menu. virtual bool AlwaysShowImages() const { return false; } + + // Returns a tinted image used in button in a menu. + virtual GtkIconSet* GetIconSetForId(int idr) { return NULL; } }; MenuGtk(MenuGtk::Delegate* delegate, menus::MenuModel* model); |