From a6d1a8dd3f462cd7ac8d300bb9ee338df83ae9f6 Mon Sep 17 00:00:00 2001 From: "agl@chromium.org" Date: Mon, 28 Sep 2009 18:37:36 +0000 Subject: Revert "gtk implemenation of Scrollbar." This reverts commit 27381 (build break). git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27384 0039d316-1c4b-4281-b951-d872f2087c98 --- views/examples/examples_main_base.cc | 2 - views/examples/scroll_view_example.h | 121 ----------------------------------- 2 files changed, 123 deletions(-) delete mode 100644 views/examples/scroll_view_example.h (limited to 'views/examples') diff --git a/views/examples/examples_main_base.cc b/views/examples/examples_main_base.cc index b407347..cd65c2c 100644 --- a/views/examples/examples_main_base.cc +++ b/views/examples/examples_main_base.cc @@ -18,7 +18,6 @@ #include "views/examples/combobox_example.h" #include "views/examples/message_box_example.h" #include "views/examples/radio_button_example.h" -#include "views/examples/scroll_view_example.h" #include "views/examples/tabbed_pane_example.h" namespace examples { @@ -75,7 +74,6 @@ void ExamplesMainBase::Run() { TabbedPaneExample tabbed_pane_example(tabbed_pane, message); MessageBoxExample message_box_example(tabbed_pane, message); RadioButtonExample radio_button_example(tabbed_pane, message); - ScrollViewExample scroll_view_example(tabbed_pane, message); widget->Show(); diff --git a/views/examples/scroll_view_example.h b/views/examples/scroll_view_example.h deleted file mode 100644 index b032224..0000000 --- a/views/examples/scroll_view_example.h +++ /dev/null @@ -1,121 +0,0 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef VIEWS_EXAMPLES_SCROLL_BAR_EXAMPLE_H_ -#define VIEWS_EXAMPLES_SCROLL_BAR_EXAMPLE_H_ - -#include "base/string_util.h" -#include "views/controls/button/text_button.h" -#include "views/controls/scroll_view.h" -#include "views/examples/example_base.h" - -namespace examples { - -class ScrollViewExample : protected ExampleBase, private views::ButtonListener { - public: - ScrollViewExample(views::TabbedPane* tabbed_pane, views::Label* message) - : ExampleBase(message), - wide_(new views::TextButton(this, L"Wide")), - tall_(new views::TextButton(this, L"Tall")), - big_square_(new views::TextButton(this, L"Big Square")), - small_square_(new views::TextButton(this, L"Small Square")), - scroll_to_(new views::TextButton(this, L"Scroll to")), - scrollable_(new ScrollableView()), - scroll_view_(new views::ScrollView()) { - scroll_view_->SetContents(scrollable_); - scrollable_->SetBounds(0, 0, 1000, 100); - scrollable_->SetColor(SK_ColorYELLOW, SK_ColorCYAN); - - views::View* container = new views::View(); - tabbed_pane->AddTab(L"Scroll View", container); - - views::GridLayout* layout = new views::GridLayout(container); - container->SetLayoutManager(layout); - - // Add scroll view. - views::ColumnSet* column_set = layout->AddColumnSet(0); - column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1, - views::GridLayout::USE_PREF, 0, 0); - layout->StartRow(1, 0); - layout->AddView(scroll_view_); - - // Add control buttons. - column_set = layout->AddColumnSet(1); - for (int i = 0; i < 5; i++) { - column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1, - views::GridLayout::USE_PREF, 0, 0); - } - layout->StartRow(0, 1); - layout->AddView(wide_); - layout->AddView(tall_); - layout->AddView(big_square_); - layout->AddView(small_square_); - layout->AddView(scroll_to_); - } - - virtual ~ScrollViewExample() {} - - private: - // ScrollView's content, which draws gradient color on background. - // TODO(oshima): add child views as well. - class ScrollableView : public views::View { - public: - ScrollableView() { - SetColor(SK_ColorRED, SK_ColorCYAN); - } - - gfx::Size GetPreferredSize() { - return gfx::Size(width(), height()); - } - - void SetColor(SkColor from, SkColor to) { - set_background( - views::Background::CreateVerticalGradientBackground(from, to)); - } - - virtual void Layout() { - SizeToPreferredSize(); - } - - private: - DISALLOW_COPY_AND_ASSIGN(ScrollableView); - }; - - // ButtonListner implementation. - virtual void ButtonPressed(views::Button* sender, const views::Event& event) { - if (sender == wide_) { - scrollable_->SetBounds(0, 0, 1000, 100); - scrollable_->SetColor(SK_ColorYELLOW, SK_ColorCYAN); - } else if (sender == tall_) { - scrollable_->SetBounds(0, 0, 100, 1000); - scrollable_->SetColor(SK_ColorRED, SK_ColorCYAN); - } else if (sender == big_square_) { - scrollable_->SetBounds(0, 0, 1000, 1000); - scrollable_->SetColor(SK_ColorRED, SK_ColorGREEN); - } else if (sender == small_square_) { - scrollable_->SetBounds(0, 0, 100, 100); - scrollable_->SetColor(SK_ColorYELLOW, SK_ColorGREEN); - } else if (sender == scroll_to_) { - scroll_view_->ScrollContentsRegionToBeVisible(20, 500, 1000, 500); - } - scroll_view_->Layout(); - } - - // Control buttons to change the size of scrollable and jump to - // predefined position. - views::TextButton* wide_, *tall_, *big_square_, *small_square_, *scroll_to_; - - // The content of the scroll view. - ScrollableView* scrollable_; - - // The scroll view to test. - views::ScrollView* scroll_view_; - - DISALLOW_COPY_AND_ASSIGN(ScrollViewExample); -}; - -} // namespace examples - -#endif // VIEWS_EXAMPLES_SCROLL_BAR_EXAMPLE_H_ - -- cgit v1.1