Bug 51812 – [GTK] Port buttons painting to GtkStyleContext

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKitGTK

[Carlos Garcia Campos]

This depends on bug #51764 since the patch for stock icons contains the initial GtkStyleContext port

[Carlos Garcia Campos]

Created attachment 77800 [details]
Paint buttons with GtkStyleContext API

[Carlos Garcia Campos]

Created attachment 77988 [details]
Update patch to current git master and fix some minor issues

[Martin Robinson]

Comment on attachment 77988 [details]
Update patch to current git master and fix some minor issues

I think we should use adjustRepaintRect to paint exterior focus outside of the actual button rect. This will prevent a large exterior focus from shrinking the button rect.

[Carlos Garcia Campos]

Created attachment 78227 [details]
Updated patch using adjustRepaintRect()

[Martin Robinson]

Comment on attachment 78227 [details]
Updated patch using adjustRepaintRect()

View in context: https://bugs.webkit.org/attachment.cgi?id=78227&action=review

Looks great! Please make the following minor adjustments before landing.

> WebCore/platform/gtk/RenderThemeGtk3.cpp:115
> +    GtkStyleContext* context;

Please initialize this to zero.

> WebCore/platform/gtk/RenderThemeGtk3.cpp:135
> +    adjustRectForFocus(context, rect);

Please ASSERT(context); here just for correctness sake.

> WebCore/platform/gtk/RenderThemeGtk3.cpp:226
> +    gboolean interiorFocus;
> +    gtk_style_context_get_style(context, "interior-focus", &interiorFocus, NULL);

This is only used inside the if (isFocused(...)) block, so it makes sense to move it there.

> WebCore/platform/gtk/RenderThemeGtk3.cpp:274
> +            buttonRect.move(borderWidth.left + focusPad, borderWidth.top + focusPad);
> +            buttonRect.setWidth(buttonRect.width() - (2 * focusPad + borderWidth.left + borderWidth.right));
> +            buttonRect.setHeight(buttonRect.height() - (2 * focusPad + borderWidth.top + borderWidth.bottom));

Instead of setting this piecewise, I think it makes more sense to set it all at once:
buttonRect = IntRect(borderWidth.left + focusPad, borderWidth.top + focusPad.
                     buttonRect.width() - (2 * focusPad + borderWidth.left + borderWidth.right),
                     buttonRect.height() - (2 * focusPad + borderWidth.top + borderWidth.bottom));

[Carlos Garcia Campos]

Committed r75255: <http://trac.webkit.org/changeset/75255>