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

Unified Diff: views/controls/tabbed_pane/tabbed_pane.cc

Issue 155668: Refactoring of tabbed-pane component so it can be ported to Linux toolkit_view (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/controls/tabbed_pane/tabbed_pane.h ('k') | views/focus/focus_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/tabbed_pane/tabbed_pane.cc
===================================================================
--- views/controls/tabbed_pane/tabbed_pane.cc (revision 0)
+++ views/controls/tabbed_pane/tabbed_pane.cc (working copy)
@@ -2,58 +2,20 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "views/controls/tabbed_pane.h"
+#include "views/controls/tabbed_pane/tabbed_pane.h"
-#include <vssym32.h>
+#include "views/controls/tabbed_pane/native_tabbed_pane_wrapper.h"
-#include "app/gfx/canvas.h"
-#include "app/gfx/font.h"
-#include "app/l10n_util_win.h"
-#include "app/resource_bundle.h"
-#include "base/gfx/native_theme.h"
-#include "base/logging.h"
-#include "base/stl_util-inl.h"
-#include "skia/ext/skia_utils_win.h"
-#include "third_party/skia/include/core/SkColor.h"
-#include "views/background.h"
-#include "views/fill_layout.h"
-#include "views/widget/root_view.h"
-#include "views/widget/widget_win.h"
-
namespace views {
-// A background object that paints the tab panel background which may be
-// rendered by the system visual styles system.
-class TabBackground : public Background {
- public:
- explicit TabBackground() {
- // TMT_FILLCOLORHINT returns a color value that supposedly
- // approximates the texture drawn by PaintTabPanelBackground.
- SkColor tab_page_color =
- gfx::NativeTheme::instance()->GetThemeColorWithDefault(
- gfx::NativeTheme::TAB, TABP_BODY, 0, TMT_FILLCOLORHINT,
- COLOR_3DFACE);
- SetNativeControlColor(tab_page_color);
- }
- virtual ~TabBackground() {}
+// static
+const char TabbedPane::kViewClassName[] = "views/TabbedPane";
- virtual void Paint(gfx::Canvas* canvas, View* view) const {
- HDC dc = canvas->beginPlatformPaint();
- RECT r = {0, 0, view->width(), view->height()};
- gfx::NativeTheme::instance()->PaintTabPanelBackground(dc, &r);
- canvas->endPlatformPaint();
- }
-
- private:
- DISALLOW_EVIL_CONSTRUCTORS(TabBackground);
-};
-
-TabbedPane::TabbedPane() : content_window_(NULL), listener_(NULL) {
+TabbedPane::TabbedPane() : native_tabbed_pane_(NULL), listener_(NULL) {
+ SetFocusable(true);
}
TabbedPane::~TabbedPane() {
- // We own the tab views, let's delete them.
- STLDeleteContainerPointers(tab_views_.begin(), tab_views_.end());
}
void TabbedPane::SetListener(Listener* listener) {
@@ -61,204 +23,67 @@
}
void TabbedPane::AddTab(const std::wstring& title, View* contents) {
- AddTabAtIndex(static_cast<int>(tab_views_.size()), title, contents, true);
+ native_tabbed_pane_->AddTab(title, contents);
}
void TabbedPane::AddTabAtIndex(int index,
const std::wstring& title,
View* contents,
bool select_if_first_tab) {
- DCHECK(index <= static_cast<int>(tab_views_.size()));
- contents->SetParentOwned(false);
- tab_views_.insert(tab_views_.begin() + index, contents);
+ native_tabbed_pane_->AddTabAtIndex(index, title, contents,
+ select_if_first_tab);
+}
- TCITEM tcitem;
- tcitem.mask = TCIF_TEXT;
+int TabbedPane::GetSelectedTabIndex() {
+ return native_tabbed_pane_->GetSelectedTabIndex();
+}
- // If the locale is RTL, we set the TCIF_RTLREADING so that BiDi text is
- // rendered properly on the tabs.
- if (UILayoutIsRightToLeft()) {
- tcitem.mask |= TCIF_RTLREADING;
- }
-
- tcitem.pszText = const_cast<wchar_t*>(title.c_str());
- int result = TabCtrl_InsertItem(tab_control_, index, &tcitem);
- DCHECK(result != -1);
-
- if (!contents->background()) {
- contents->set_background(new TabBackground);
- }
-
- if (tab_views_.size() == 1 && select_if_first_tab) {
- // If this is the only tab displayed, make sure the contents is set.
- content_window_->GetRootView()->AddChildView(contents);
- }
-
- // The newly added tab may have made the contents window smaller.
- ResizeContents(tab_control_);
+View* TabbedPane::GetSelectedTab() {
+ return native_tabbed_pane_->GetSelectedTab();
}
View* TabbedPane::RemoveTabAtIndex(int index) {
- int tab_count = static_cast<int>(tab_views_.size());
- DCHECK(index >= 0 && index < tab_count);
-
- if (index < (tab_count - 1)) {
- // Select the next tab.
- SelectTabAt(index + 1);
- } else {
- // We are the last tab, select the previous one.
- if (index > 0) {
- SelectTabAt(index - 1);
- } else {
- // That was the last tab. Remove the contents.
- content_window_->GetRootView()->RemoveAllChildViews(false);
- }
- }
- TabCtrl_DeleteItem(tab_control_, index);
-
- // The removed tab may have made the contents window bigger.
- ResizeContents(tab_control_);
-
- std::vector<View*>::iterator iter = tab_views_.begin() + index;
- View* removed_tab = *iter;
- tab_views_.erase(iter);
-
- return removed_tab;
+ return native_tabbed_pane_->RemoveTabAtIndex(index);
}
void TabbedPane::SelectTabAt(int index) {
- DCHECK((index >= 0) && (index < static_cast<int>(tab_views_.size())));
- TabCtrl_SetCurSel(tab_control_, index);
- DoSelectTabAt(index);
+ native_tabbed_pane_->SelectTabAt(index);
}
-void TabbedPane::SelectTabForContents(const View* contents) {
- SelectTabAt(GetIndexForContents(contents));
+int TabbedPane::GetTabCount() {
+ return native_tabbed_pane_->GetTabCount();
}
-int TabbedPane::GetTabCount() {
- return TabCtrl_GetItemCount(tab_control_);
+void TabbedPane::CreateWrapper() {
+ native_tabbed_pane_ = NativeTabbedPaneWrapper::CreateNativeWrapper(this);
}
-HWND TabbedPane::CreateNativeControl(HWND parent_container) {
- // Create the tab control.
- //
- // Note that we don't follow the common convention for NativeControl
- // subclasses and we don't pass the value returned from
- // NativeControl::GetAdditionalExStyle() as the dwExStyle parameter. Here is
- // why: on RTL locales, if we pass NativeControl::GetAdditionalExStyle() when
- // we basically tell Windows to create our HWND with the WS_EX_LAYOUTRTL. If
- // we do that, then the HWND we create for |content_window_| below will
- // inherit the WS_EX_LAYOUTRTL property and this will result in the contents
- // being flipped, which is not what we want (because we handle mirroring in
- // views without the use of Windows' support for mirroring). Therefore,
- // we initially create our HWND without the aforementioned property and we
- // explicitly set this property our child is created. This way, on RTL
- // locales, our tabs will be nicely rendered from right to left (by virtue of
- // Windows doing the right thing with the TabbedPane HWND) and each tab
- // contents will use an RTL layout correctly (by virtue of the mirroring
- // infrastructure in views doing the right thing with each View we put
- // in the tab).
- tab_control_ = ::CreateWindowEx(0,
- WC_TABCONTROL,
- L"",
- WS_CHILD | WS_CLIPSIBLINGS | WS_VISIBLE,
- 0, 0, width(), height(),
- parent_container, NULL, NULL, NULL);
-
- HFONT font = ResourceBundle::GetSharedInstance().
- GetFont(ResourceBundle::BaseFont).hfont();
- SendMessage(tab_control_, WM_SETFONT, reinterpret_cast<WPARAM>(font), FALSE);
-
- // Create the view container which is a child of the TabControl.
- content_window_ = new WidgetWin();
- content_window_->Init(tab_control_, gfx::Rect());
-
- // Explicitly setting the WS_EX_LAYOUTRTL property for the HWND (see above
- // for a thorough explanation regarding why we waited until |content_window_|
- // if created before we set this property for the tabbed pane's HWND).
- if (UILayoutIsRightToLeft()) {
- l10n_util::HWNDSetRTLLayout(tab_control_);
- }
-
- RootView* root_view = content_window_->GetRootView();
- root_view->SetLayoutManager(new FillLayout());
- DWORD sys_color = ::GetSysColor(COLOR_3DHILIGHT);
- SkColor color = SkColorSetRGB(GetRValue(sys_color), GetGValue(sys_color),
- GetBValue(sys_color));
- root_view->set_background(Background::CreateSolidBackground(color));
-
- content_window_->SetFocusTraversableParentView(this);
- ResizeContents(tab_control_);
- return tab_control_;
+// View overrides:
+std::string TabbedPane::GetClassName() const {
+ return kViewClassName;
}
-LRESULT TabbedPane::OnNotify(int w_param, LPNMHDR l_param) {
- if (static_cast<LPNMHDR>(l_param)->code == TCN_SELCHANGE) {
- int selected_tab = TabCtrl_GetCurSel(tab_control_);
- DCHECK(selected_tab != -1);
- DoSelectTabAt(selected_tab);
- return TRUE;
+void TabbedPane::ViewHierarchyChanged(bool is_add, View* parent, View* child) {
+ if (is_add && !native_tabbed_pane_ && GetWidget()) {
+ CreateWrapper();
+ AddChildView(native_tabbed_pane_->GetView());
}
- return FALSE;
}
-void TabbedPane::DoSelectTabAt(int index) {
- RootView* content_root = content_window_->GetRootView();
-
- // Clear the focus if the focused view was on the tab.
- FocusManager* focus_manager = GetFocusManager();
- DCHECK(focus_manager);
- View* focused_view = focus_manager->GetFocusedView();
- if (focused_view && content_root->IsParentOf(focused_view))
- focus_manager->ClearFocus();
-
- content_root->RemoveAllChildViews(false);
- content_root->AddChildView(tab_views_[index]);
- content_root->Layout();
- if (listener_)
- listener_->TabSelectedAt(index);
-}
-
-int TabbedPane::GetIndexForContents(const View* contents) const {
- std::vector<View*>::const_iterator i =
- std::find(tab_views_.begin(), tab_views_.end(), contents);
- DCHECK(i != tab_views_.end());
- return static_cast<int>(i - tab_views_.begin());
-}
-
void TabbedPane::Layout() {
- NativeControl::Layout();
- ResizeContents(GetNativeControlHWND());
-}
-
-RootView* TabbedPane::GetContentsRootView() {
- return content_window_->GetRootView();
-}
-
-FocusTraversable* TabbedPane::GetFocusTraversable() {
- return content_window_;
-}
-
-void TabbedPane::ViewHierarchyChanged(bool is_add, View *parent, View *child) {
- NativeControl::ViewHierarchyChanged(is_add, parent, child);
-
- if (is_add && (child == this) && content_window_) {
- // We have been added to a view hierarchy, update the FocusTraversable
- // parent.
- content_window_->SetFocusTraversableParent(GetRootView());
+ if (native_tabbed_pane_) {
+ native_tabbed_pane_->GetView()->SetBounds(0, 0, width(), height());
+ native_tabbed_pane_->GetView()->Layout();
}
}
-void TabbedPane::ResizeContents(HWND tab_control) {
- DCHECK(tab_control);
- CRect content_bounds;
- if (!GetClientRect(tab_control, &content_bounds))
- return;
- TabCtrl_AdjustRect(tab_control, FALSE, &content_bounds);
- content_window_->MoveWindow(content_bounds.left, content_bounds.top,
- content_bounds.Width(), content_bounds.Height(),
- TRUE);
+void TabbedPane::Focus() {
+ // Forward the focus to the wrapper.
+ if (native_tabbed_pane_)
+ native_tabbed_pane_->SetFocus();
+ else
+ View::Focus(); // Will focus the RootView window (so we still get keyboard
+ // messages).
}
} // namespace views
« no previous file with comments | « views/controls/tabbed_pane/tabbed_pane.h ('k') | views/focus/focus_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698