diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 00:47:43 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 00:47:43 +0000 |
| commit | 727079c951951b16c012788ac91e85fde2920c2c (patch) | |
| tree | 22342b9f73a24911323e1aef35781bcbad12d5f7 /app/gfx | |
| parent | 0d4f8f71ef1f07376f1b005981ecb6ef35921331 (diff) | |
| download | chromium_src-727079c951951b16c012788ac91e85fde2920c2c.zip chromium_src-727079c951951b16c012788ac91e85fde2920c2c.tar.gz chromium_src-727079c951951b16c012788ac91e85fde2920c2c.tar.bz2 | |
GTK: more browser action toolbar functionality.
- Resize smartly after dragging (animate to the "right" size)
- Add the overflow menu (it is clickable, but you can't drag to/from it)
- Resize appropriately after adding/removing buttons
still TODO:
- persist the #icons that are visible
BUG=32101
TEST=manual
Review URL: http://codereview.chromium.org/897001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41372 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/gfx')
| -rw-r--r-- | app/gfx/gtk_util.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/gfx/gtk_util.cc b/app/gfx/gtk_util.cc index 03d0504..98b174b 100644 --- a/app/gfx/gtk_util.cc +++ b/app/gfx/gtk_util.cc @@ -29,7 +29,11 @@ const GdkColor kGdkBlack = GDK_COLOR_RGB(0x00, 0x00, 0x00); const GdkColor kGdkGreen = GDK_COLOR_RGB(0x00, 0xff, 0x00); GdkPixbuf* GdkPixbufFromSkBitmap(const SkBitmap* bitmap) { + if (bitmap->isNull()) + return NULL; + bitmap->lockPixels(); + int width = bitmap->width(); int height = bitmap->height(); int stride = bitmap->rowBytes(); |