Changeset 76351 in webkit

Timestamp:

Jan 21, 2011 9:21:51 AM (13 years ago)

Author:

Carlos Garcia Campos

Message:

2011-01-21 Carlos Garcia Campos <​cgarcia@igalia.com>

Reviewed by Martin Robinson.

[GTK] Show caps lock indicator in password fields
​https://bugs.webkit.org/show_bug.cgi?id=52878

Test: manual-tests/password-caps-lock.html

• platform/gtk/KeyEventGtk.cpp: (WebCore::PlatformKeyboardEvent::currentCapsLockState): Implement currentCapsLockState() using GDK API.
• platform/gtk/RenderThemeGtk.cpp: (WebCore::RenderThemeGtk::paintCapsLockIndicator): Paint an icon in the password field when the caps lock modifier is locked.
• platform/gtk/RenderThemeGtk.h:

2011-01-21 Carlos Garcia Campos <​cgarcia@igalia.com>

Reviewed by Martin Robinson.

[GTK] Show caps lock indicator in password fields
​https://bugs.webkit.org/show_bug.cgi?id=52878

Test: manual-tests/password-caps-lock.html

• webkit/webkitwebview.cpp: (webkit_web_view_key_release_event): Call capsLockStateMayHaveChanged() when caps lock key is pressed.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/gtk/KeyEventGtk.cpp (modified) (1 diff)
• WebCore/platform/gtk/RenderThemeGtk.cpp (modified) (1 diff)
• WebCore/platform/gtk/RenderThemeGtk.h (modified) (1 diff)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/webkit/webkitwebview.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-21  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Show caps lock indicator in password fields
+        https://bugs.webkit.org/show_bug.cgi?id=52878
+
+        Test: manual-tests/password-caps-lock.html
+
+        * platform/gtk/KeyEventGtk.cpp:
+        (WebCore::PlatformKeyboardEvent::currentCapsLockState): Implement
+        currentCapsLockState() using GDK API.
+        * platform/gtk/RenderThemeGtk.cpp:
+        (WebCore::RenderThemeGtk::paintCapsLockIndicator): Paint an icon
+        in the password field when the caps lock modifier is locked.
+        * platform/gtk/RenderThemeGtk.h:
+
 2011-01-21  Pavel Podivilov  <podivilov@chromium.org>
 

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

@@ -584 +584 @@
 bool PlatformKeyboardEvent::currentCapsLockState()
 {
-    notImplemented();
-    return false;
+    return gdk_keymap_get_caps_lock_state(gdk_keymap_get_default());
 }
 

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

@@ -310 +310 @@
 }
 
+bool RenderThemeGtk::paintCapsLockIndicator(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
+{
+    // The other paint methods don't need to check whether painting is disabled because RenderTheme already checks it
+    // before calling them, but paintCapsLockIndicator() is called by RenderTextControlSingleLine which doesn't check it.
+    if (paintInfo.context->paintingDisabled())
+        return true;
+
+    GRefPtr<GdkPixbuf> icon = getStockIcon(GTK_TYPE_ENTRY, GTK_STOCK_CAPS_LOCK_WARNING,
+                                           gtkTextDirection(renderObject->style()->direction()),
+                                           gtkIconState(this, renderObject), GTK_ICON_SIZE_MENU);
+
+    // GTK+ locates the icon right aligned in the entry. The given rectangle is already
+    // centered vertically by RenderTextControlSingleLine.
+    IntPoint iconPosition(rect.x() + rect.width() - gdk_pixbuf_get_width(icon.get()), rect.y());
+    paintGdkPixbuf(paintInfo.context, icon.get(), iconPosition);
+    return true;
+}
+
 void RenderThemeGtk::adjustSliderTrackStyle(CSSStyleSelector*, RenderStyle* style, Element*) const
 {

trunk/Source/WebCore/platform/gtk/RenderThemeGtk.h

@@ -170 +170 @@
 #endif
 
+    virtual bool paintCapsLockIndicator(RenderObject*, const PaintInfo&, const IntRect&);
+
 private:
     void platformInit();

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2011-01-21  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Show caps lock indicator in password fields
+        https://bugs.webkit.org/show_bug.cgi?id=52878
+
+        Test: manual-tests/password-caps-lock.html
+
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_key_release_event): Call
+        capsLockStateMayHaveChanged() when caps lock key is pressed.
+
 2011-01-19  Joone Hur  <joone.hur@collabora.co.uk>
 

trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp

@@ -790 +790 @@
     if (!frame->view())
         return FALSE;
+
+    if (event->keyval == GDK_Caps_Lock)
+        frame->eventHandler()->capsLockStateMayHaveChanged();
 
     PlatformKeyboardEvent keyboardEvent(event);