summaryrefslogtreecommitdiffstats
path: root/views/widget
diff options
context:
space:
mode:
Diffstat (limited to 'views/widget')
-rw-r--r--views/widget/native_widget_gtk.cc20
-rw-r--r--views/widget/native_widget_gtk.h2
-rw-r--r--views/widget/tooltip_manager_views.cc198
-rw-r--r--views/widget/tooltip_manager_views.h80
-rw-r--r--views/widget/widget.h3
5 files changed, 299 insertions, 4 deletions
diff --git a/views/widget/native_widget_gtk.cc b/views/widget/native_widget_gtk.cc
index ffd0667..5fdf830 100644
--- a/views/widget/native_widget_gtk.cc
+++ b/views/widget/native_widget_gtk.cc
@@ -36,17 +36,20 @@
#include "views/widget/gtk_views_fixed.h"
#include "views/widget/gtk_views_window.h"
#include "views/widget/native_widget_views.h"
-#include "views/widget/tooltip_manager_gtk.h"
+#include "views/widget/root_view.h"
#include "views/widget/widget_delegate.h"
#include "views/window/hit_test.h"
#if defined(TOUCH_UI)
+#include "views/widget/tooltip_manager_views.h"
#if defined(HAVE_XINPUT2)
#include <gdk/gdkx.h>
#include "ui/gfx/gtk_util.h"
#include "views/touchui/touch_factory.h"
#endif
+#else
+#include "views/widget/tooltip_manager_gtk.h"
#endif
#if defined(HAVE_IBUS)
@@ -776,7 +779,15 @@ void NativeWidgetGtk::InitNativeWidget(const Widget::InitParams& params) {
ui::GObjectDestructorFILO::GetInstance()->Connect(
G_OBJECT(widget_), &OnDestroyedThunk, this);
+#if defined(TOUCH_UI)
+ if (params.type != Widget::InitParams::TYPE_TOOLTIP) {
+ views::TooltipManagerViews* manager = new views::TooltipManagerViews(
+ static_cast<internal::RootView*>(GetWidget()->GetRootView()));
+ tooltip_manager_.reset(manager);
+ }
+#else
tooltip_manager_.reset(new TooltipManagerGtk(this));
+#endif
// Register for tooltips.
g_object_set(G_OBJECT(window_contents_), "has-tooltip", TRUE, NULL);
@@ -1589,7 +1600,12 @@ gboolean NativeWidgetGtk::OnQueryTooltip(GtkWidget* widget,
gint y,
gboolean keyboard_mode,
GtkTooltip* tooltip) {
- return tooltip_manager_->ShowTooltip(x, y, keyboard_mode, tooltip);
+#if defined(TOUCH_UI)
+ return false; // Tell GTK not to draw tooltips as we draw tooltips in views
+#else
+ return static_cast<TooltipManagerGtk*>(tooltip_manager_.get())->
+ ShowTooltip(x, y, keyboard_mode, tooltip);
+#endif
}
gboolean NativeWidgetGtk::OnVisibilityNotify(GtkWidget* widget,
diff --git a/views/widget/native_widget_gtk.h b/views/widget/native_widget_gtk.h
index 2171d52..e7e34f33 100644
--- a/views/widget/native_widget_gtk.h
+++ b/views/widget/native_widget_gtk.h
@@ -361,7 +361,7 @@ class NativeWidgetGtk : public internal::NativeWidgetPrivate,
// The TooltipManager.
// WARNING: RootView's destructor calls into the TooltipManager. As such, this
// must be destroyed AFTER root_view_.
- scoped_ptr<TooltipManagerGtk> tooltip_manager_;
+ scoped_ptr<TooltipManager> tooltip_manager_;
scoped_ptr<DropTargetGtk> drop_target_;
diff --git a/views/widget/tooltip_manager_views.cc b/views/widget/tooltip_manager_views.cc
new file mode 100644
index 0000000..98f38dc
--- /dev/null
+++ b/views/widget/tooltip_manager_views.cc
@@ -0,0 +1,198 @@
+// Copyright (c) 2011 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.
+
+#include "views/widget/tooltip_manager_views.h"
+
+#include <X11/Xlib.h>
+#include <X11/extensions/XInput2.h>
+
+#include "base/logging.h"
+#include "base/time.h"
+#include "base/utf_string_conversions.h"
+#include "third_party/skia/include/core/SkColor.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/font.h"
+#include "views/background.h"
+#include "views/border.h"
+#include "views/focus/focus_manager.h"
+#include "views/screen.h"
+#include "views/view.h"
+#include "views/widget/native_widget.h"
+#include "views/widget/root_view.h"
+
+namespace {
+SkColor kTooltipBackground = 0xFF7F7F00;
+int kTooltipTimeoutMs = 500;
+
+// FIXME: get cursor offset from actual cursor size.
+int kCursorOffsetX = 10;
+int kCursorOffsetY = 15;
+}
+
+namespace views {
+
+// static
+int TooltipManager::GetTooltipHeight() {
+ // Not used for linux and chromeos.
+ NOTREACHED();
+ return 0;
+}
+
+// static
+gfx::Font TooltipManager::GetDefaultFont() {
+ return ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont);
+}
+
+// static
+const std::wstring& TooltipManager::GetLineSeparator() {
+ static const std::wstring* line_separator = new std::wstring(L"\n");
+ return *line_separator;
+}
+
+// static
+int TooltipManager::GetMaxWidth(int x, int y) {
+ // FIXME: change this. This is for now just copied from TooltipManagerGtk.
+
+ // We always display the tooltip inside the root view. So the max width is
+ // the width of the view.
+ gfx::Rect monitor_bounds =
+ Screen::GetMonitorAreaNearestPoint(gfx::Point(x, y));
+ // GtkLabel (gtk_label_ensure_layout) forces wrapping at this size. We mirror
+ // the size here otherwise tooltips wider than the size used by gtklabel end
+ // up with extraneous empty lines.
+ return monitor_bounds.width() == 0 ? 800 : (monitor_bounds.width() + 1) / 2;
+}
+
+TooltipManagerViews::TooltipManagerViews(internal::RootView* root_view)
+ : root_view_(root_view),
+ tooltip_view_(NULL) {
+ tooltip_label_.set_background(
+ views::Background::CreateSolidBackground(kTooltipBackground));
+ tooltip_widget_.reset(CreateTooltip());
+ tooltip_widget_->SetContentsView(&tooltip_label_);
+ tooltip_widget_->Activate();
+ tooltip_widget_->SetAlwaysOnTop(true);
+ tooltip_timer_.Start(base::TimeDelta::FromMilliseconds(kTooltipTimeoutMs),
+ this, &TooltipManagerViews::TooltipTimerFired);
+ MessageLoopForUI::current()->AddObserver(this);
+}
+
+TooltipManagerViews::~TooltipManagerViews() {
+ MessageLoopForUI::current()->RemoveObserver(this);
+ tooltip_widget_->CloseNow();
+}
+
+void TooltipManagerViews::UpdateTooltip() {
+ UpdateIfRequired(curr_mouse_pos_.x(), curr_mouse_pos_.y(), false);
+}
+
+void TooltipManagerViews::TooltipTextChanged(View* view) {
+ if (tooltip_widget_->IsVisible())
+ UpdateIfRequired(curr_mouse_pos_.x(), curr_mouse_pos_.y(), false);
+}
+
+void TooltipManagerViews::ShowKeyboardTooltip(View* view) {
+ NOTREACHED();
+}
+
+void TooltipManagerViews::HideKeyboardTooltip() {
+ NOTREACHED();
+}
+
+base::MessagePumpObserver::EventStatus TooltipManagerViews::WillProcessXEvent(
+ XEvent* xevent) {
+ XGenericEventCookie* cookie = &xevent->xcookie;
+ if (cookie->evtype == XI_Motion) {
+ XIDeviceEvent* xievent = static_cast<XIDeviceEvent*>(cookie->data);
+ if (tooltip_timer_.IsRunning())
+ tooltip_timer_.Reset();
+ curr_mouse_pos_.SetPoint((int) xievent->event_x, (int) xievent->event_y);
+
+ // If tooltip is visible, we may want to hide it. If it is not, we are ok.
+ if (tooltip_widget_->IsVisible())
+ UpdateIfRequired(curr_mouse_pos_.x(), curr_mouse_pos_.y(), false);
+ }
+ return base::MessagePumpObserver::EVENT_CONTINUE;
+}
+
+void TooltipManagerViews::TooltipTimerFired() {
+ if (tooltip_widget_->IsVisible()) {
+ UpdateIfRequired(curr_mouse_pos_.x(), curr_mouse_pos_.y(), false);
+ } else {
+ tooltip_view_ = GetViewForTooltip(curr_mouse_pos_.x(), curr_mouse_pos_.y(),
+ false);
+ Update();
+ }
+}
+
+View* TooltipManagerViews::GetViewForTooltip(int x, int y, bool for_keyboard) {
+ View* view = NULL;
+ if (!for_keyboard) {
+ view = root_view_->GetEventHandlerForPoint(gfx::Point(x, y));
+ } else {
+ FocusManager* focus_manager = root_view_->GetFocusManager();
+ if (focus_manager)
+ view = focus_manager->GetFocusedView();
+ }
+ return view;
+}
+
+void TooltipManagerViews::UpdateIfRequired(int x, int y, bool for_keyboard) {
+ View* view = GetViewForTooltip(x, y, for_keyboard);
+ std::wstring tooltip_text;
+ if (view)
+ view->GetTooltipText(gfx::Point(x, y), &tooltip_text);
+
+ if (tooltip_view_ != view || tooltip_text_ != tooltip_text) {
+ tooltip_view_ = view;
+ Update();
+ }
+}
+
+void TooltipManagerViews::Update() {
+ if (!tooltip_view_ ||
+ !tooltip_view_->GetTooltipText(gfx::Point(), &tooltip_text_))
+ tooltip_text_.clear();
+
+ if (tooltip_text_.empty()) {
+ tooltip_widget_->Hide();
+ } else {
+ int max_width, line_count;
+ std::wstring tooltip_text(tooltip_text_);
+ TrimTooltipToFit(&tooltip_text, &max_width, &line_count,
+ curr_mouse_pos_.x(), curr_mouse_pos_.y());
+ tooltip_label_.SetText(tooltip_text);
+
+ SetTooltipBounds(curr_mouse_pos_, max_width,
+ tooltip_label_.GetPreferredSize().height());
+ tooltip_widget_->Show();
+ }
+}
+
+void TooltipManagerViews::SetTooltipBounds(gfx::Point mouse_pos,
+ int tooltip_width,
+ int tooltip_height) {
+ View::ConvertPointToScreen(root_view_, &mouse_pos);
+ gfx::Rect tooltip_rect(mouse_pos.x(), mouse_pos.y(), tooltip_width,
+ tooltip_height);
+
+ tooltip_rect.Offset(kCursorOffsetX, kCursorOffsetY);
+ gfx::Rect monitor_bounds =
+ Screen::GetMonitorAreaNearestPoint(tooltip_rect.origin());
+ tooltip_widget_->SetBounds(tooltip_rect.AdjustToFit(monitor_bounds));
+}
+
+Widget* TooltipManagerViews::CreateTooltip() {
+ Widget* widget = new Widget;
+ Widget::InitParams params;
+ params.type = Widget::InitParams::TYPE_TOOLTIP;
+ params.keep_on_top = true;
+ params.accept_events = false;
+ params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+ widget->Init(params);
+ widget->SetOpacity(0x00);
+ return widget;
+}
+
+} // namespace views
diff --git a/views/widget/tooltip_manager_views.h b/views/widget/tooltip_manager_views.h
new file mode 100644
index 0000000..8bffaed
--- /dev/null
+++ b/views/widget/tooltip_manager_views.h
@@ -0,0 +1,80 @@
+// Copyright (c) 2011 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_WIDGET_TOOLTIP_MANAGER_VIEWS_H_
+#define VIEWS_WIDGET_TOOLTIP_MANAGER_VIEWS_H_
+#pragma once
+
+#include "base/message_loop.h"
+#include "base/message_pump_x.h"
+#include "base/timer.h"
+#include "views/controls/label.h"
+#include "views/widget/native_widget.h"
+#include "views/widget/tooltip_manager.h"
+#include "views/widget/widget_delegate.h"
+#include "views/view.h"
+
+typedef union _GdkEvent GdkEvent;
+typedef union _XEvent XEvent;
+
+namespace views {
+
+namespace internal {
+class RootView;
+}
+
+class Widget;
+
+// TooltipManager implementation for Views.
+class TooltipManagerViews : public TooltipManager,
+ public MessageLoopForUI::Observer {
+ public:
+ explicit TooltipManagerViews(internal::RootView* root_view);
+ virtual ~TooltipManagerViews();
+
+ // TooltipManager.
+ virtual void UpdateTooltip() OVERRIDE;
+ virtual void TooltipTextChanged(View* view) OVERRIDE;
+ virtual void ShowKeyboardTooltip(View* view) OVERRIDE;
+ virtual void HideKeyboardTooltip() OVERRIDE;
+
+ // MessageLoopForUI::Observer
+ virtual base::MessagePumpObserver::EventStatus WillProcessXEvent(
+ XEvent* xevent) OVERRIDE;
+
+ private:
+ void TooltipTimerFired();
+ View* GetViewForTooltip(int x, int y, bool for_keyboard);
+
+ // Updates the tooltip if required (if there is any change in the tooltip
+ // text or the view.
+ void UpdateIfRequired(int x, int y, bool for_keyboard);
+
+ // Updates the tooltip. Gets the tooltip text from tooltip_view_ and displays
+ // it at the current mouse position.
+ void Update();
+
+ // Adjusts the bounds given by the arguments to fit inside the parent view
+ // and applies the adjusted bounds to the tooltip_label_.
+ void SetTooltipBounds(gfx::Point mouse_pos, int tooltip_width,
+ int tooltip_height);
+
+ // Creates a widget of type TYPE_TOOLTIP
+ Widget* CreateTooltip();
+
+ scoped_ptr<Widget> tooltip_widget_;
+ internal::RootView* root_view_;
+ View* tooltip_view_;
+ std::wstring tooltip_text_;
+ Label tooltip_label_;
+
+ gfx::Point curr_mouse_pos_;
+ base::RepeatingTimer<TooltipManagerViews> tooltip_timer_;
+
+ DISALLOW_COPY_AND_ASSIGN(TooltipManagerViews);
+};
+
+} // namespace views
+
+#endif // VIEWS_WIDGET_TOOLTIP_MANAGER_VIEWS_H_
diff --git a/views/widget/widget.h b/views/widget/widget.h
index 463f547..07096ae 100644
--- a/views/widget/widget.h
+++ b/views/widget/widget.h
@@ -108,8 +108,9 @@ class Widget : public internal::NativeWidgetDelegate,
// An undecorated Window.
TYPE_CONTROL, // A control, like a button.
TYPE_POPUP, // An undecorated Window, with transient properties.
- TYPE_MENU // An undecorated Window, with transient properties
+ TYPE_MENU, // An undecorated Window, with transient properties
// specialized to menus.
+ TYPE_TOOLTIP,
};
enum Ownership {
// Default. Creator is not responsible for managing the lifetime of the
generated by cgit v1.1 at 2025-03-12 22:58:31 +0000