Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(755)

Side by Side Diff: chrome/browser/ui/libgtk2ui/gtk2_border.cc

Issue 1234223005: Initial gtk3 support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix gtk2 colors Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "chrome/browser/ui/libgtk2ui/gtk2_util.h" 10 #include "chrome/browser/ui/libgtk2ui/gtk2_util.h"
11 #include "chrome/browser/ui/libgtk2ui/native_theme_gtk2.h" 11 #include "chrome/browser/ui/libgtk2ui/native_theme_gtk2.h"
12 #include "third_party/skia/include/effects/SkLerpXfermode.h" 12 #include "third_party/skia/include/effects/SkLerpXfermode.h"
13 #include "ui/base/theme_provider.h" 13 #include "ui/base/theme_provider.h"
14 #include "ui/gfx/animation/animation.h" 14 #include "ui/gfx/animation/animation.h"
15 #include "ui/gfx/canvas.h" 15 #include "ui/gfx/canvas.h"
16 #include "ui/gfx/geometry/rect.h" 16 #include "ui/gfx/geometry/rect.h"
17 #include "ui/gfx/image/image_skia_source.h" 17 #include "ui/gfx/image/image_skia_source.h"
18 #include "ui/gfx/skia_util.h" 18 #include "ui/gfx/skia_util.h"
19 #include "ui/views/controls/button/blue_button.h" 19 #include "ui/views/controls/button/blue_button.h"
20 #include "ui/views/controls/button/label_button.h" 20 #include "ui/views/controls/button/label_button.h"
21 #include "ui/views/controls/button/label_button_border.h" 21 #include "ui/views/controls/button/label_button_border.h"
22 #include "ui/views/native_theme_delegate.h" 22 #include "ui/views/native_theme_delegate.h"
23 23
24 using views::Button; 24 using views::Button;
25 using views::NativeThemeDelegate; 25 using views::NativeThemeDelegate;
26 26
27 namespace libgtk2ui { 27 namespace libgtk2ui {
28 28
29 namespace {
30
31 const int kNumberOfFocusedStates = 2;
32
33 class ButtonImageSkiaSource : public gfx::ImageSkiaSource {
34 public:
35 ButtonImageSkiaSource(const Gtk2UI* gtk2_ui,
36 const GtkStateType state,
37 const bool focused,
38 const bool call_to_action,
39 const gfx::Size& size)
40 : gtk2_ui_(gtk2_ui),
41 state_(state),
42 focused_(focused),
43 call_to_action_(call_to_action),
44 size_(size) {
45 }
46
47 ~ButtonImageSkiaSource() override {}
48
49 gfx::ImageSkiaRep GetImageForScale(float scale) override {
50 int w = size_.width() * scale;
51 int h = size_.height() * scale;
52 return gfx::ImageSkiaRep(
53 gtk2_ui_->DrawGtkButtonBorder(state_, focused_, call_to_action_, w, h),
54 scale);
55 }
56
57 private:
58 const Gtk2UI* gtk2_ui_;
59 const GtkStateType state_;
60 const bool focused_;
61 const bool call_to_action_;
62 const gfx::Size size_;
63
64 DISALLOW_COPY_AND_ASSIGN(ButtonImageSkiaSource);
65 };
66
67 } // namespace
68
69 Gtk2Border::Gtk2Border(Gtk2UI* gtk2_ui, 29 Gtk2Border::Gtk2Border(Gtk2UI* gtk2_ui,
70 views::LabelButton* owning_button, 30 views::LabelButton* owning_button,
71 scoped_ptr<views::LabelButtonBorder> border) 31 scoped_ptr<views::LabelButtonBorder> border)
72 : gtk2_ui_(gtk2_ui), 32 : gtk2_ui_(gtk2_ui),
73 owning_button_(owning_button), 33 owning_button_(owning_button),
74 border_(border.Pass()), 34 border_(border.Pass()),
75 observer_manager_(this) { 35 observer_manager_(this) {
76 observer_manager_.Add(NativeThemeGtk2::instance()); 36 observer_manager_.Add(NativeThemeGtk2::instance());
77 } 37 }
78 38
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 gfx::Insets Gtk2Border::GetInsets() const { 72 gfx::Insets Gtk2Border::GetInsets() const {
113 return border_->GetInsets(); 73 return border_->GetInsets();
114 } 74 }
115 75
116 gfx::Size Gtk2Border::GetMinimumSize() const { 76 gfx::Size Gtk2Border::GetMinimumSize() const {
117 return border_->GetMinimumSize(); 77 return border_->GetMinimumSize();
118 } 78 }
119 79
120 void Gtk2Border::OnNativeThemeUpdated(ui::NativeTheme* observed_theme) { 80 void Gtk2Border::OnNativeThemeUpdated(ui::NativeTheme* observed_theme) {
121 DCHECK_EQ(observed_theme, NativeThemeGtk2::instance()); 81 DCHECK_EQ(observed_theme, NativeThemeGtk2::instance());
122 for (int i = 0; i < kNumberOfFocusedStates; ++i) { 82 for (int i = 0; i < 2; ++i) {
123 for (int j = 0; j < views::Button::STATE_COUNT; ++j) { 83 for (int j = 0; j < views::Button::STATE_COUNT; ++j) {
124 button_images_[i][j] = gfx::ImageSkia(); 84 button_images_[i][j] = gfx::ImageSkia();
125 } 85 }
126 } 86 }
127 87
128 // Our owning view must have its layout invalidated because the insets could 88 // Our owning view must have its layout invalidated because the insets could
129 // have changed. 89 // have changed.
130 owning_button_->InvalidateLayout(); 90 owning_button_->InvalidateLayout();
131 } 91 }
132 92
133 void Gtk2Border::PaintState(const ui::NativeTheme::State state, 93 void Gtk2Border::PaintState(const ui::NativeTheme::State state,
134 const ui::NativeTheme::ExtraParams& extra, 94 const ui::NativeTheme::ExtraParams& extra,
135 const gfx::Rect& rect, 95 const gfx::Rect& rect,
136 gfx::Canvas* canvas) { 96 gfx::Canvas* canvas) {
137 bool focused = extra.button.is_focused; 97 bool focused = extra.button.is_focused;
138 Button::ButtonState views_state = Button::GetButtonStateFrom(state); 98 Button::ButtonState views_state = Button::GetButtonStateFrom(state);
139 99
140 if (border_->PaintsButtonState(focused, views_state)) { 100 if (border_->PaintsButtonState(focused, views_state)) {
141 gfx::ImageSkia* image = &button_images_[focused][views_state]; 101 gfx::ImageSkia* image = &button_images_[focused][views_state];
142 102
143 if (image->isNull() || image->size() != rect.size()) { 103 if (image->isNull() || image->size() != rect.size()) {
144 bool call_to_action = owning_button_->GetClassName() == 104 *image = gfx::ImageSkia::CreateFrom1xBitmap(
knthzh 2015/08/21 03:21:47 Okay, I put in some test code that sets state to k
Evan Stade 2015/08/21 15:24:17 yes, it's still used: https://code.google.com/p/c
145 views::BlueButton::kViewClassName; 105 gtk2_ui_->DrawGtkButtonBorder(state,
146 GtkStateType gtk_state = GetGtkState(state); 106 rect.width(),
147 *image = gfx::ImageSkia( 107 rect.height()));
148 new ButtonImageSkiaSource(gtk2_ui_,
149 gtk_state,
150 focused,
151 call_to_action,
152 rect.size()),
153 rect.size());
154 } 108 }
155 canvas->DrawImageInt(*image, rect.x(), rect.y()); 109 canvas->DrawImageInt(*image, rect.x(), rect.y());
156 } 110 }
157 } 111 }
158 112
159 } // namespace libgtk2ui 113 } // namespace libgtk2ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698