diff options
Diffstat (limited to 'chrome/browser/gtk/tabs/tab_renderer_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/tabs/tab_renderer_gtk.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc index 22bdcff..318fcbe 100644 --- a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc @@ -417,6 +417,19 @@ void TabRendererGtk::PaintFavIconArea(GdkEventExpose* event) { PaintIcon(&canvas); } +bool TabRendererGtk::ShouldShowIcon() const { + if (mini() && height() >= GetMinimumUnselectedSize().height()) { + return true; + } else if (!data_.show_icon) { + return false; + } else if (IsSelected()) { + // The selected tab clips favicon before close button. + return IconCapacity() >= 2; + } + // Non-selected tabs clip close button before favicon. + return IconCapacity() >= 1; +} + // static gfx::Size TabRendererGtk::GetMinimumUnselectedSize() { InitResources(); @@ -960,19 +973,6 @@ int TabRendererGtk::IconCapacity() const { return (width() - kLeftPadding - kRightPadding) / kFavIconSize; } -bool TabRendererGtk::ShouldShowIcon() const { - if (mini() && height() >= GetMinimumUnselectedSize().height()) { - return true; - } else if (!data_.show_icon) { - return false; - } else if (IsSelected()) { - // The selected tab clips favicon before close button. - return IconCapacity() >= 2; - } - // Non-selected tabs clip close button before favicon. - return IconCapacity() >= 1; -} - bool TabRendererGtk::ShouldShowCloseBox() const { // The selected tab never clips close button. return !mini() && (IsSelected() || IconCapacity() >= 3); |
