Changeset 25807 in webkit

Timestamp:

Sep 29, 2007 8:30:20 AM (17 years ago)

Author:

zecke

Message:

2007-09-28 Jan Michael Alonzo <​jmalonzo@unpluggable.com>

Reviewed by Mark.

-Fix ​http://bugs.webkit.org/show_bug.cgi?id=15254.

• platform/gtk/RenderThemeGtk.cpp: (WebCore::RenderThemeGtk::determineState):
  • Apply state if control is readonly
  • Added state GTK_STATE_SELECTED of object is checked
  • Apply GTK_STATE_ACTIVE if RenderObject isFocused()

(WebCore::RenderThemeGtk::paintTextField):
(WebCore::RenderThemeGtk::gtkEntry):

• Implemented theme-aware text field based on gtk/gtkentry.c implementation

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/gtk/RenderThemeGtk.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-09-28  Jan Michael Alonzo  <jmalonzo@unpluggable.com>
+
+        Reviewed by Mark.
+
+        -Fix http://bugs.webkit.org/show_bug.cgi?id=15254.
+
+        * platform/gtk/RenderThemeGtk.cpp:
+        (WebCore::RenderThemeGtk::determineState):
+            - Apply state if control is readonly
+            - Added state GTK_STATE_SELECTED of object is checked
+            - Apply GTK_STATE_ACTIVE if RenderObject isFocused()
+        (WebCore::RenderThemeGtk::paintTextField):
+        (WebCore::RenderThemeGtk::gtkEntry):
+            - Implemented theme-aware text field based on gtk/gtkentry.c implementation
+
 2007-09-29  Holger Hans Peter Freyther  <zecke@selfish.org>
 

trunk/WebCore/platform/gtk/RenderThemeGtk.cpp

@@ -128 +128 @@
 GtkStateType RenderThemeGtk::determineState(RenderObject* o)
 {
-    GtkStateType result = GTK_STATE_NORMAL;
-    if (!isEnabled(o))
-        result = GTK_STATE_INSENSITIVE;
-    else if (isPressed(o))
-        result = GTK_STATE_ACTIVE;
-    else if (isHovered(o))
-        result = GTK_STATE_PRELIGHT;
-    return result;
+    if (!isEnabled(o) || isReadOnlyControl(o))
+        return GTK_STATE_INSENSITIVE;
+    if (isPressed(o) || isFocused(o))
+        return GTK_STATE_ACTIVE;
+    if (isHovered(o))
+        return GTK_STATE_PRELIGHT;
+    if (isChecked(o))
+        return GTK_STATE_SELECTED;
+
+    return GTK_STATE_NORMAL;
 }
 
@@ -240 +242 @@
 }
 
-bool RenderThemeGtk::paintTextField(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r)
+bool RenderThemeGtk::paintTextField(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& rect)
 {
     // FIXME: should use theme-aware drawing
-    return true;
+    GtkWidget* entry = gtkEntry();
+    IntPoint pos = i.context->translatePoint(rect.location());
+
+    gtk_paint_shadow(entry->style, i.context->gdkDrawable(),
+                     determineState(o), determineShadow(o),
+                     0, entry, "entry",
+                     pos.x(), pos.y(), rect.width(), rect.height());
+    return false;
 }
 
@@ -291 +300 @@
 
     return m_gtkRadioButton;
+}
+
+GtkWidget* RenderThemeGtk::gtkEntry() const
+{
+    if (!m_gtkEntry) {
+        m_gtkEntry = gtk_entry_new();
+        gtk_container_add(GTK_CONTAINER(gtkWindowContainer()), m_gtkEntry);
+        gtk_widget_realize(m_gtkEntry);
+    }
+
+    return m_gtkEntry;
 }