Changeset 24595 in webkit

Timestamp:

Jul 24, 2007 11:29:35 AM (17 years ago)

Author:

alp

Message:

2007-07-24 Alp Toker <​alp.toker@collabora.co.uk>

Reviewed by Adam.

​http://bugs.webkit.org/show_bug.cgi?id=14711
RenderThemeGdk's buttons are state-agnostic (pressed, hovered)

Remove unnecessary label from widget instances.
Render check and radio widgets correctly.
Determine the widget state and render it appropriately.

• platform/gdk/RenderThemeGdk.cpp: (WebCore::RenderThemeGdk::determineState): (WebCore::RenderThemeGdk::paintCheckbox): (WebCore::RenderThemeGdk::paintRadio): (WebCore::RenderThemeGdk::paintButton): (WebCore::RenderThemeGdk::gtkButton): (WebCore::RenderThemeGdk::gtkCheckbox): (WebCore::RenderThemeGdk::gtkRadioButton):
• platform/gdk/RenderThemeGdk.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/gdk/RenderThemeGdk.cpp (modified) (8 diffs)
• platform/gdk/RenderThemeGdk.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-07-24  Alp Toker  <alp.toker@collabora.co.uk>
+
+        Reviewed by Adam.
+
+        http://bugs.webkit.org/show_bug.cgi?id=14711
+        RenderThemeGdk's buttons are state-agnostic (pressed, hovered)
+
+        Remove unnecessary label from widget instances.
+        Render check and radio widgets correctly.
+        Determine the widget state and render it appropriately.
+
+        * platform/gdk/RenderThemeGdk.cpp:
+        (WebCore::RenderThemeGdk::determineState):
+        (WebCore::RenderThemeGdk::paintCheckbox):
+        (WebCore::RenderThemeGdk::paintRadio):
+        (WebCore::RenderThemeGdk::paintButton):
+        (WebCore::RenderThemeGdk::gtkButton):
+        (WebCore::RenderThemeGdk::gtkCheckbox):
+        (WebCore::RenderThemeGdk::gtkRadioButton):
+        * platform/gdk/RenderThemeGdk.h:
+
 2007-07-24  Mark Rowe  <mrowe@apple.com>
 

trunk/WebCore/platform/gdk/RenderThemeGdk.cpp

@@ -5 +5 @@
  * Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com 
  * Copyright (C) 2007 Holger Hans Peter Freyther
+ * Copyright (C) 2007 Alp Toker <alp.toker@collabora.co.uk>
  * All rights reserved.
  *
@@ -34 +35 @@
 #define THEME_COLOR 204
 #define THEME_FONT  210
-
-// Generic state constants
-#define TS_NORMAL    1
-#define TS_HOVER     2
-#define TS_ACTIVE    3
-#define TS_DISABLED  4
-#define TS_FOCUSED   5
 
 // Button constants
@@ -132 +126 @@
 }
 
-unsigned RenderThemeGdk::determineState(RenderObject* o)
-{
-    unsigned result = TS_NORMAL;
+GtkStateType RenderThemeGdk::determineState(RenderObject* o)
+{
+    GtkStateType result = GTK_STATE_NORMAL;
     if (!isEnabled(o))
-        result = TS_DISABLED;
-    else if (isReadOnlyControl(o))
-        result = TFS_READONLY; // Readonly is supported on textfields.
-    else if (supportsFocus(o->style()->appearance()) && isFocused(o))
-        result = TS_FOCUSED;
+        result = GTK_STATE_INSENSITIVE;
     else if (isPressed(o))
-        result = TS_ACTIVE;
+        result = GTK_STATE_ACTIVE;
     else if (isHovered(o))
-        result = TS_HOVER;
-    if (isChecked(o))
-        result += 4; // 4 unchecked states, 4 checked states.
+        result = GTK_STATE_PRELIGHT;
     return result;
 }
@@ -188 +176 @@
     // FIXME: is it the right thing to do?
     GtkWidget *checkbox = gtkCheckbox();
-    gtk_paint_box(checkbox->style, i.context->gdkDrawable(),
-                  GTK_STATE_NORMAL, GTK_SHADOW_OUT,
-                  NULL, checkbox, "checkbutton",
-                  rect.x(), rect.y(), rect.width(), rect.height());
+    gtk_paint_check(checkbox->style, i.context->gdkDrawable(),
+                    determineState(o), isChecked(o) ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
+                    NULL, checkbox, "checkbutton",
+                    rect.x(), rect.y(), rect.width(), rect.height());
 
     return false;
@@ -220 +208 @@
     // FIXME: is it the right thing to do?
     GtkWidget *radio = gtkRadioButton();
-    gtk_paint_box(radio->style, i.context->gdkDrawable(),
-                  GTK_STATE_NORMAL, GTK_SHADOW_OUT,
-                  NULL, radio, "radiobutton",
-                  rect.x(), rect.y(), rect.width(), rect.height());
-
-    return false;
-}
-
-bool RenderThemeGdk::paintButton(RenderObject*, const RenderObject::PaintInfo& i, const IntRect& rect) 
+    gtk_paint_option(radio->style, i.context->gdkDrawable(),
+                     determineState(o), isChecked(o) ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
+                     NULL, radio, "radiobutton",
+                     rect.x(), rect.y(), rect.width(), rect.height());
+
+    return false;
+}
+
+bool RenderThemeGdk::paintButton(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& rect) 
 { 
     // FIXME: should use theme-aware drawing. This should honor the state as well
     GtkWidget *button = gtkButton();
     gtk_paint_box(button->style, i.context->gdkDrawable(),
-                  GTK_STATE_NORMAL, GTK_SHADOW_OUT,
+                  determineState(o), isChecked(o) ? GTK_SHADOW_IN : GTK_SHADOW_OUT,
                   NULL, button, "button",
                   rect.x(), rect.y(), rect.width(), rect.height());
@@ -267 +255 @@
 {
     if (!m_gtkButton) {
-        m_gtkButton = gtk_button_new_with_label("WebKit rocks");
+        m_gtkButton = gtk_button_new();
         gtk_container_add(GTK_CONTAINER(gtkWindowContainer()), m_gtkButton);
         gtk_widget_realize(m_gtkButton);
@@ -278 +266 @@
 {
     if (!m_gtkCheckbox) {
-        m_gtkCheckbox = gtk_check_button_new_with_label("WebKit rocks"); 
+        m_gtkCheckbox = gtk_check_button_new();
         gtk_container_add(GTK_CONTAINER(gtkWindowContainer()), m_gtkCheckbox);
         gtk_widget_realize(m_gtkCheckbox);
@@ -289 +277 @@
 {
     if (!m_gtkRadioButton) {
-        m_gtkRadioButton = gtk_radio_button_new_with_label(NULL, "WebKit rocks");
+        m_gtkRadioButton = gtk_radio_button_new(NULL);
         gtk_container_add(GTK_CONTAINER(gtkWindowContainer()), m_gtkRadioButton);
         gtk_widget_realize(m_gtkRadioButton);

trunk/WebCore/platform/gdk/RenderThemeGdk.h

@@ -70 +70 @@
     void close();
 
-    unsigned determineState(RenderObject*);
+    GtkStateType determineState(RenderObject*);
     bool supportsFocus(EAppearance);