AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

render: We use CHECKED now, not ACTIVE

Browse Source 
Update docs and custom rendering of checkmarks and radio buttons
This commit is contained in:
Benjamin Otte 2014-10-21 05:15:37 +02:00
parent 4ed98878c6
commit 57d24f173a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkrender.c
View File

@ -160,7 +160,7 @@ gtk_do_render_check (GtkStyleContext *context,
} }
else else
{ {
if (flags & GTK_STATE_FLAG_ACTIVE) if (flags & GTK_STATE_FLAG_CHECKED)
{ {
cairo_translate (cr, cairo_translate (cr,
x + pad, y + pad); x + pad, y + pad);
@ -207,7 +207,7 @@ gtk_do_render_check (GtkStyleContext *context,
* *
* Renders a checkmark (as in a #GtkCheckButton). * Renders a checkmark (as in a #GtkCheckButton).
* *
* The %GTK_STATE_FLAG_ACTIVE state determines whether the check is * The %GTK_STATE_FLAG_CHECKED state determines whether the check is
* on or off, and %GTK_STATE_FLAG_INCONSISTENT determines whether it * on or off, and %GTK_STATE_FLAG_INCONSISTENT determines whether it
* should be marked as undefined. * should be marked as undefined.
* *
@ -323,7 +323,7 @@ gtk_do_render_option (GtkStyleContext *context,
line_thickness); line_thickness);
cairo_fill (cr); cairo_fill (cr);
} }
if (flags & GTK_STATE_FLAG_ACTIVE) if (flags & GTK_STATE_FLAG_CHECKED)
{ {
pad = thickness + MAX (1, 2 * (exterior_size - 2 * thickness) / 9); pad = thickness + MAX (1, 2 * (exterior_size - 2 * thickness) / 9);
interior_size = MAX (1, exterior_size - 2 * pad); interior_size = MAX (1, exterior_size - 2 * pad);
@ -355,7 +355,7 @@ gtk_do_render_option (GtkStyleContext *context,
* @width: rectangle width * @width: rectangle width
* @height: rectangle height * @height: rectangle height
* *
* Renders an option mark (as in a #GtkRadioButton), the %GTK_STATE_FLAG_ACTIVE * Renders an option mark (as in a #GtkRadioButton), the %GTK_STATE_FLAG_CHECKED
* state will determine whether the option is on or off, and * state will determine whether the option is on or off, and
* %GTK_STATE_FLAG_INCONSISTENT whether it should be marked as undefined. * %GTK_STATE_FLAG_INCONSISTENT whether it should be marked as undefined.
* *
@ -1115,7 +1115,7 @@ gtk_do_render_expander (GtkStyleContext *context,
* @height: rectangle height * @height: rectangle height
* *
* Renders an expander (as used in #GtkTreeView and #GtkExpander) in the area * Renders an expander (as used in #GtkTreeView and #GtkExpander) in the area
* defined by @x, @y, @width, @height. The state %GTK_STATE_FLAG_ACTIVE * defined by @x, @y, @width, @height. The state %GTK_STATE_FLAG_CHECKED
* determines whether the expander is collapsed or expanded. * determines whether the expander is collapsed or expanded.
* *
* Typical expander rendering: * Typical expander rendering:
@ -2163,7 +2163,7 @@ gtk_do_render_activity (GtkStyleContext *context,
* @height: rectangle height * @height: rectangle height
* *
* Renders an activity indicator (such as in #GtkSpinner). * Renders an activity indicator (such as in #GtkSpinner).
* The state %GTK_STATE_FLAG_ACTIVE determines whether there is * The state %GTK_STATE_FLAG_CHECKED determines whether there is
* activity going on. * activity going on.
* *
* Since: 3.0 * Since: 3.0