diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-21 21:41:08 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-21 21:41:08 +0000 |
| commit | 43efc50cf60427e9c6cdc77116c5807fe66ee070 (patch) | |
| tree | 1e057e1e9b7feb4fcf9adfe467324a67f888090e /chrome/browser/gtk/gtk_theme_provider.cc | |
| parent | 96f8063420f0170207f8b8fad211c70d3ad66db6 (diff) | |
| download | chromium_src-43efc50cf60427e9c6cdc77116c5807fe66ee070.zip chromium_src-43efc50cf60427e9c6cdc77116c5807fe66ee070.tar.gz chromium_src-43efc50cf60427e9c6cdc77116c5807fe66ee070.tar.bz2 | |
GTK: Use GtkWindows instead of GtkFixed when rendering icons.
There is some weird interaction with the gtk-qt-engine. If we don't use a
GtkWindow to render the icons, we will render the GNOME default folder icon
instead of the folder icon of the current KDE theme.
BUG=37494
TEST=none
Review URL: http://codereview.chromium.org/1687006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45245 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/gtk_theme_provider.cc')
| -rw-r--r-- | chrome/browser/gtk/gtk_theme_provider.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/gtk/gtk_theme_provider.cc b/chrome/browser/gtk/gtk_theme_provider.cc index 5cacf79..ab8cd00 100644 --- a/chrome/browser/gtk/gtk_theme_provider.cc +++ b/chrome/browser/gtk/gtk_theme_provider.cc @@ -387,7 +387,7 @@ CairoCachedSurface* GtkThemeProvider::GetSurfaceNamed( GdkPixbuf* GtkThemeProvider::GetFolderIcon(bool native) { if (native) { if (!icon_widget_) - icon_widget_ = gtk_fixed_new(); + icon_widget_ = gtk_window_new(GTK_WINDOW_TOPLEVEL); // We never release our ref, so we will leak this on program shutdown. if (!default_folder_icon_) { default_folder_icon_ = @@ -408,7 +408,7 @@ GdkPixbuf* GtkThemeProvider::GetFolderIcon(bool native) { GdkPixbuf* GtkThemeProvider::GetDefaultFavicon(bool native) { if (native) { if (!icon_widget_) - icon_widget_ = gtk_fixed_new(); + icon_widget_ = gtk_window_new(GTK_WINDOW_TOPLEVEL); // We never release our ref, so we will leak this on program shutdown. if (!default_bookmark_icon_) { default_bookmark_icon_ = |