| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/libgtk2ui/gtk2_border.h" | 5 #include "chrome/browser/ui/libgtk2ui/gtk2_border.h" |
| 6 | 6 |
| 7 #include <gtk/gtk.h> | 7 #include <gtk/gtk.h> |
| 8 | 8 |
| 9 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h" | 9 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h" |
| 10 #include "third_party/skia/include/effects/SkLerpXfermode.h" | 10 #include "third_party/skia/include/effects/SkLerpXfermode.h" |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 }; | 69 }; |
| 70 | 70 |
| 71 } // namespace | 71 } // namespace |
| 72 | 72 |
| 73 Gtk2Border::Gtk2Border(Gtk2UI* gtk2_ui, | 73 Gtk2Border::Gtk2Border(Gtk2UI* gtk2_ui, |
| 74 views::LabelButton* owning_button, | 74 views::LabelButton* owning_button, |
| 75 scoped_ptr<views::Border> border) | 75 scoped_ptr<views::Border> border) |
| 76 : gtk2_ui_(gtk2_ui), | 76 : gtk2_ui_(gtk2_ui), |
| 77 owning_button_(owning_button), | 77 owning_button_(owning_button), |
| 78 border_(border.Pass()) { | 78 border_(border.Pass()) { |
| 79 gtk2_ui_->AddNativeThemeChangeObserver(this); | 79 gtk2_ui_->GetNativeTheme()->AddObserver(this); |
| 80 } | 80 } |
| 81 | 81 |
| 82 Gtk2Border::~Gtk2Border() { | 82 Gtk2Border::~Gtk2Border() { |
| 83 gtk2_ui_->RemoveNativeThemeChangeObserver(this); | 83 gtk2_ui_->GetNativeTheme()->RemoveObserver(this); |
| 84 } | 84 } |
| 85 | 85 |
| 86 void Gtk2Border::Paint(const views::View& view, gfx::Canvas* canvas) { | 86 void Gtk2Border::Paint(const views::View& view, gfx::Canvas* canvas) { |
| 87 ui::ThemeProvider* provider = owning_button_->GetThemeProvider(); | 87 ui::ThemeProvider* provider = owning_button_->GetThemeProvider(); |
| 88 if (!provider || !provider->UsingNativeTheme()) { | 88 if (!provider || !provider->UsingNativeTheme()) { |
| 89 border_->Paint(view, canvas); | 89 border_->Paint(view, canvas); |
| 90 return; | 90 return; |
| 91 } | 91 } |
| 92 | 92 |
| 93 DCHECK_EQ(&view, owning_button_); | 93 DCHECK_EQ(&view, owning_button_); |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 | 137 |
| 138 gfx::Size Gtk2Border::GetMinimumSize() const { | 138 gfx::Size Gtk2Border::GetMinimumSize() const { |
| 139 ui::ThemeProvider* provider = owning_button_->GetThemeProvider(); | 139 ui::ThemeProvider* provider = owning_button_->GetThemeProvider(); |
| 140 if (!provider || !provider->UsingNativeTheme()) | 140 if (!provider || !provider->UsingNativeTheme()) |
| 141 return border_->GetMinimumSize(); | 141 return border_->GetMinimumSize(); |
| 142 | 142 |
| 143 gfx::Insets insets = GetInsets(); | 143 gfx::Insets insets = GetInsets(); |
| 144 return gfx::Size(insets.width(), insets.height()); | 144 return gfx::Size(insets.width(), insets.height()); |
| 145 } | 145 } |
| 146 | 146 |
| 147 void Gtk2Border::OnNativeThemeChanged() { | 147 void Gtk2Border::OnNativeThemeChange() { |
| 148 for (int i = 0; i < kNumberOfFocusedStates; ++i) { | 148 for (int i = 0; i < kNumberOfFocusedStates; ++i) { |
| 149 for (int j = 0; j < views::Button::STATE_COUNT; ++j) { | 149 for (int j = 0; j < views::Button::STATE_COUNT; ++j) { |
| 150 button_images_[i][j] = gfx::ImageSkia(); | 150 button_images_[i][j] = gfx::ImageSkia(); |
| 151 } | 151 } |
| 152 } | 152 } |
| 153 | 153 |
| 154 // Our owning view must have its layout invalidated because the insets could | 154 // Our owning view must have its layout invalidated because the insets could |
| 155 // have changed. | 155 // have changed. |
| 156 owning_button_->InvalidateLayout(); | 156 owning_button_->InvalidateLayout(); |
| 157 } | 157 } |
| (...skipping 25 matching lines...) Expand all Loading... |
| 183 return true; | 183 return true; |
| 184 } else if (owning_button_->style() == Button::STYLE_TEXTBUTTON) { | 184 } else if (owning_button_->style() == Button::STYLE_TEXTBUTTON) { |
| 185 return focused == false && (state == Button::STATE_HOVERED || | 185 return focused == false && (state == Button::STATE_HOVERED || |
| 186 state == Button::STATE_PRESSED); | 186 state == Button::STATE_PRESSED); |
| 187 } | 187 } |
| 188 | 188 |
| 189 return false; | 189 return false; |
| 190 } | 190 } |
| 191 | 191 |
| 192 } // namespace libgtk2ui | 192 } // namespace libgtk2ui |
| OLD | NEW |