Changeset 95800 in webkit

Timestamp:

Sep 23, 2011 7:14:01 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[Gtk] Title attribute is not respected on option elements.
​https://bugs.webkit.org/show_bug.cgi?id=68615

Patch by Deepak Sherveghar <​bpwv64@motorola.com> on 2011-09-23
Reviewed by Martin Robinson.

Set tooltip on PopupMenuGtk items created from GtkActions.

• platform/gtk/GtkPopupMenu.cpp:

(WebCore::GtkPopupMenu::appendItem): Added a call to gtk_widget_set_tooltip_text()

to set the tooltip on menuitem. Tooltip text is retrieved from GtkAction.

• platform/gtk/PopupMenuGtk.cpp:

(WebCore::PopupMenuGtk::createGtkActionForMenuItem): Pass the tooltip text

from client when creating a GtkAction.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/gtk/GtkPopupMenu.cpp (modified) (1 diff)
• platform/gtk/PopupMenuGtk.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-23  Deepak Sherveghar  <bpwv64@motorola.com>
+
+        [Gtk] Title attribute is not respected on option elements.
+        https://bugs.webkit.org/show_bug.cgi?id=68615
+
+        Reviewed by Martin Robinson.
+
+        Set tooltip on PopupMenuGtk items created from GtkActions.
+
+        * platform/gtk/GtkPopupMenu.cpp:
+        (WebCore::GtkPopupMenu::appendItem): Added a call to gtk_widget_set_tooltip_text()
+            to set the tooltip on menuitem. Tooltip text is retrieved from GtkAction.
+        * platform/gtk/PopupMenuGtk.cpp:
+        (WebCore::PopupMenuGtk::createGtkActionForMenuItem): Pass the tooltip text
+            from client when creating a GtkAction.
+
 2011-09-23  Yael Aharon  <yael.aharon@nokia.com>
 

trunk/Source/WebCore/platform/gtk/GtkPopupMenu.cpp

@@ -66 +66 @@
 {
     GtkWidget* menuItem = gtk_action_create_menu_item(action);
+    gtk_widget_set_tooltip_text(menuItem, gtk_action_get_tooltip(action));
     g_signal_connect(menuItem, "select", G_CALLBACK(GtkPopupMenu::selectItemCallback), this);
     gtk_menu_shell_append(GTK_MENU_SHELL(m_popup.get()), menuItem);

trunk/Source/WebCore/platform/gtk/PopupMenuGtk.cpp

@@ -55 +55 @@
 {
     GOwnPtr<char> actionName(g_strdup_printf("popup-menu-action-%d", itemIndex));
-    GtkAction* action = gtk_action_new(actionName.get(), client()->itemText(itemIndex).utf8().data(), 0, 0);
+    GtkAction* action = gtk_action_new(actionName.get(), client()->itemText(itemIndex).utf8().data(), client()->itemToolTip(itemIndex).utf8().data(), 0);
     g_object_set_data(G_OBJECT(action), "popup-menu-action-index", GINT_TO_POINTER(itemIndex));
     g_signal_connect(action, "activate", G_CALLBACK(menuItemActivated), this);