diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 23:42:25 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 23:42:25 +0000 |
| commit | e7ef2785c24227ec59e5e906d17185ebcaa8af76 (patch) | |
| tree | d75363112496def057e4bd87fa8d305d4fb6b596 | |
| parent | 70be00a42dc3288f483ff16e8c94a2a84b382cf6 (diff) | |
| download | chromium_src-e7ef2785c24227ec59e5e906d17185ebcaa8af76.zip chromium_src-e7ef2785c24227ec59e5e906d17185ebcaa8af76.tar.gz chromium_src-e7ef2785c24227ec59e5e906d17185ebcaa8af76.tar.bz2 | |
Some views GTK fixes.
Fix the crazy font on infobars by reducing the "medium" font size.
Make tab dragging not immediately crash by crating a dragged tab container.
Review URL: http://codereview.chromium.org/155253
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20209 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | app/resource_bundle.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/views/tabs/dragged_tab_view.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/views/tabs/dragged_tab_view.h | 5 |
3 files changed, 15 insertions, 1 deletions
diff --git a/app/resource_bundle.cc b/app/resource_bundle.cc index 4acac71..e04f79e 100644 --- a/app/resource_bundle.cc +++ b/app/resource_bundle.cc @@ -170,7 +170,11 @@ void ResourceBundle::LoadFontsIfNecessary() { *small_font_ = base_font_->DeriveFont(-2); medium_font_.reset(new gfx::Font()); +#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS) + *medium_font_ = base_font_->DeriveFont(2); +#else *medium_font_ = base_font_->DeriveFont(3); +#endif medium_bold_font_.reset(new gfx::Font()); *medium_bold_font_ = diff --git a/chrome/browser/views/tabs/dragged_tab_view.cc b/chrome/browser/views/tabs/dragged_tab_view.cc index b77ace5..2ba37bf 100644 --- a/chrome/browser/views/tabs/dragged_tab_view.cc +++ b/chrome/browser/views/tabs/dragged_tab_view.cc @@ -13,6 +13,8 @@ #include "views/widget/widget.h" #if defined(OS_WIN) #include "views/widget/widget_win.h" +#elif defined(OS_LINUX) +#include "views/widget/widget_gtk.h" #endif const int kTransparentAlpha = 200; @@ -57,7 +59,10 @@ DraggedTabView::DraggedTabView(TabContents* datasource, show_contents_on_drag_ = false; } #else - NOTIMPLEMENTED(); + container_.reset(new views::WidgetGtk(views::WidgetGtk::TYPE_POPUP)); + container_->set_delete_on_destroy(false); + container_->Init(NULL, gfx::Rect(0, 0, 0, 0)); + container_->SetContentsView(this); #endif } diff --git a/chrome/browser/views/tabs/dragged_tab_view.h b/chrome/browser/views/tabs/dragged_tab_view.h index 6e63ed7..3651983 100644 --- a/chrome/browser/views/tabs/dragged_tab_view.h +++ b/chrome/browser/views/tabs/dragged_tab_view.h @@ -9,11 +9,16 @@ #include "base/gfx/point.h" #include "base/gfx/size.h" #include "base/task.h" +#include "build/build_config.h" #include "third_party/skia/include/core/SkBitmap.h" #include "views/view.h" namespace views { +#if defined(OS_WIN) class WidgetWin; +#elif defined(OS_LINUX) +class WidgetGtk; +#endif } namespace gfx { class Point; |