AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-11 11:20:12 +00:00
Code Issues Projects Releases Wiki Activity

Remove deprecated GtkSpinner style properties

Browse Source
This commit is contained in:
Matthias Clasen 2011-01-05 23:21:52 -05:00
parent 2b3b3934a4
commit 072023e57b
4 changed files with 5 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkcellrendererspinner.c
View File

@ -126,10 +126,8 @@ gtk_cell_renderer_spinner_class_init (GtkCellRendererSpinnerClass *klass)
* Pulse of the spinner. Increment this value to draw the next frame of the
* spinner animation. Usually, you would update this value in a timeout.
*
* The #GtkSpinner widget draws one full cycle of the animation per second by default.
* You can learn about the number of frames used by the theme
* by looking at the #GtkSpinner:num-steps style property and the duration
* of the cycle by looking at #GtkSpinner:cycle-duration.
* By default, the #GtkSpinner widget draws one full cycle of the animation,
* consisting of 12 frames, in 750 milliseconds.
*
* Since: 2.20
*/
@ -172,7 +170,7 @@ gtk_cell_renderer_spinner_init (GtkCellRendererSpinner *cell)
}
/**
* gtk_cell_renderer_spinner_new
* gtk_cell_renderer_spinner_new:
*
* Returns a new cell renderer which will show a spinner to indicate
* activity.

37
gtk/gtkspinner.c
View File

@ -119,43 +119,6 @@ gtk_spinner_class_init (GtkSpinnerClass *klass)
P_("Whether the spinner is active"),
FALSE,
G_PARAM_READWRITE));
/**
* GtkSpinner:num-steps:
*
* The number of steps for the spinner to complete a full loop.
* The animation will complete a full cycle in one second by default
* (see the #GtkSpinner:cycle-duration style property).
*
* Since: 2.20
*
* Deprecated: 3.0
*/
gtk_widget_class_install_style_property (widget_class,
g_param_spec_uint ("num-steps",
P_("Number of steps"),
P_("The number of steps for the spinner to complete a full loop. The animation will complete a full cycle in one second by default (see #GtkSpinner:cycle-duration)."),
1,
G_MAXUINT,
12,
G_PARAM_READABLE));
/**
* GtkSpinner:cycle-duration:
*
* The duration in milliseconds for the spinner to complete a full cycle.
*
* Since: 2.20
*
* Deprecated: 3.0
*/
gtk_widget_class_install_style_property (widget_class,
g_param_spec_uint ("cycle-duration",
P_("Animation duration"),
P_("The length of time in milliseconds for the spinner to complete a full loop"),
500,
G_MAXUINT,
1000,
G_PARAM_READABLE));
}
static void

4
gtk/gtkstyle.c
View File

@ -2841,9 +2841,7 @@ gtk_default_draw_spinner (GtkStyle *style,
gint i;
guint real_step;
gtk_style_get (style, GTK_TYPE_SPINNER,
"num-steps", &num_steps,
NULL);
num_steps = 12;
real_step = step % num_steps;
/* set a clip region for the expose event */

8
gtk/gtkthemingengine.c
View File

@ -2912,18 +2912,12 @@ gtk_theming_engine_render_activity (GtkThemingEngine *engine,
gdouble half;
gint i;
num_steps = 0;
gtk_theming_engine_get_style (engine,
"num-steps", &num_steps,
NULL);
num_steps = 12;
state = gtk_theming_engine_get_state (engine);
gtk_theming_engine_get (engine, state,
"color", &color,
NULL);
if (num_steps == 0)
num_steps = 12;
if (gtk_theming_engine_state_is_running (engine, GTK_STATE_ACTIVE, &progress))
step = (guint) (progress * num_steps);