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

Side by Side Diff: views/examples/native_widget_views_example.cc

Issue 8405002: ui/gfx: Convert Canvas::FillRectInt() to use gfx::Rect. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: save some vertical space, interactive_ui_tests are fixed by Peter's fix Created 9 years, 1 month 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "views/examples/native_widget_views_example.h" 5 #include "views/examples/native_widget_views_example.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "ui/gfx/canvas.h" 8 #include "ui/gfx/canvas.h"
9 #include "views/controls/button/text_button.h" 9 #include "views/controls/button/text_button.h"
10 #include "views/examples/example_base.h" 10 #include "views/examples/example_base.h"
11 #include "views/test/test_views_delegate.h" 11 #include "views/test/test_views_delegate.h"
12 #include "views/view.h" 12 #include "views/view.h"
13 #include "views/widget/native_widget_views.h"
13 #include "views/widget/widget.h" 14 #include "views/widget/widget.h"
14 #include "views/widget/native_widget_views.h"
15 15
16 namespace examples { 16 namespace examples {
17 17
18 // A ContentView for our example widget. Contains a variety of controls for 18 // A ContentView for our example widget. Contains a variety of controls for
19 // testing NativeWidgetViews event handling. If any part of the Widget's bounds 19 // testing NativeWidgetViews event handling. If any part of the Widget's bounds
20 // are rendered red, something went wrong. 20 // are rendered red, something went wrong.
21 class TestContentView : public views::View, 21 class TestContentView : public views::View,
22 public views::ButtonListener { 22 public views::ButtonListener {
23 public: 23 public:
24 TestContentView() 24 TestContentView()
25 : click_count_(0), 25 : click_count_(0),
26 ALLOW_THIS_IN_INITIALIZER_LIST( 26 ALLOW_THIS_IN_INITIALIZER_LIST(
27 button_(new views::TextButton(this, ASCIIToUTF16("Click me!")))) { 27 button_(new views::TextButton(this, ASCIIToUTF16("Click me!")))) {
28 AddChildView(button_); 28 AddChildView(button_);
29 } 29 }
30 virtual ~TestContentView() { 30 virtual ~TestContentView() {
31 } 31 }
32 32
33 // Overridden from views::View: 33 // Overridden from views::View:
34 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { 34 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
35 SkColor color = click_count_ % 2 == 0 ? SK_ColorGREEN : SK_ColorBLUE; 35 SkColor color = click_count_ % 2 == 0 ? SK_ColorGREEN : SK_ColorBLUE;
36 canvas->FillRectInt(color, 0, 0, width(), height()); 36 canvas->FillRect(color, GetLocalBounds());
37 } 37 }
38 virtual void Layout() OVERRIDE { 38 virtual void Layout() OVERRIDE {
39 button_->SetBounds(10, 10, width() - 20, height() - 20); 39 button_->SetBounds(10, 10, width() - 20, height() - 20);
40 } 40 }
41 41
42 // Overridden from views::ButtonListener: 42 // Overridden from views::ButtonListener:
43 virtual void ButtonPressed(views::Button* sender, 43 virtual void ButtonPressed(views::Button* sender,
44 const views::Event& event) OVERRIDE { 44 const views::Event& event) OVERRIDE {
45 if (sender == button_) { 45 if (sender == button_) {
46 ++click_count_; 46 ++click_count_;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 86
87 #if defined(OS_WIN) 87 #if defined(OS_WIN)
88 test_views_delegate->set_default_parent_view(old_default_parent_view); 88 test_views_delegate->set_default_parent_view(old_default_parent_view);
89 #endif 89 #endif
90 90
91 widget->SetContentsView(new TestContentView); 91 widget->SetContentsView(new TestContentView);
92 widget->SetBounds(gfx::Rect(10, 10, 300, 150)); 92 widget->SetBounds(gfx::Rect(10, 10, 300, 150));
93 } 93 }
94 94
95 } // namespace examples 95 } // namespace examples
OLDNEW
« no previous file with comments | « views/examples/native_theme_button_example.cc ('k') | views/touchui/touch_selection_controller_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698