forked from AuroraMiddleware/gtk
GtkStyleContext: Remove the frame clock
It's unused within GtkStyleContext.
This commit is contained in:
parent
70c8cfa480
commit
218b39fe01
@ -4865,7 +4865,6 @@ gtk_style_context_get_parent
|
|||||||
gtk_style_context_get_path
|
gtk_style_context_get_path
|
||||||
gtk_style_context_get_property
|
gtk_style_context_get_property
|
||||||
gtk_style_context_get_display
|
gtk_style_context_get_display
|
||||||
gtk_style_context_get_frame_clock
|
|
||||||
gtk_style_context_get_state
|
gtk_style_context_get_state
|
||||||
gtk_style_context_get_valist
|
gtk_style_context_get_valist
|
||||||
gtk_style_context_get_section
|
gtk_style_context_get_section
|
||||||
@ -4888,7 +4887,6 @@ gtk_style_context_remove_class
|
|||||||
gtk_style_context_has_class
|
gtk_style_context_has_class
|
||||||
gtk_style_context_list_classes
|
gtk_style_context_list_classes
|
||||||
gtk_style_context_set_display
|
gtk_style_context_set_display
|
||||||
gtk_style_context_set_frame_clock
|
|
||||||
gtk_style_context_set_state
|
gtk_style_context_set_state
|
||||||
gtk_style_context_set_scale
|
gtk_style_context_set_scale
|
||||||
gtk_style_context_get_scale
|
gtk_style_context_get_scale
|
||||||
|
@ -123,8 +123,6 @@ struct _GtkStyleContextPrivate
|
|||||||
GtkCssNode *cssnode;
|
GtkCssNode *cssnode;
|
||||||
GSList *saved_nodes;
|
GSList *saved_nodes;
|
||||||
|
|
||||||
GdkFrameClock *frame_clock;
|
|
||||||
|
|
||||||
GtkCssStyleChange *invalidating_context;
|
GtkCssStyleChange *invalidating_context;
|
||||||
};
|
};
|
||||||
typedef struct _GtkStyleContextPrivate GtkStyleContextPrivate;
|
typedef struct _GtkStyleContextPrivate GtkStyleContextPrivate;
|
||||||
@ -132,7 +130,6 @@ typedef struct _GtkStyleContextPrivate GtkStyleContextPrivate;
|
|||||||
enum {
|
enum {
|
||||||
PROP_0,
|
PROP_0,
|
||||||
PROP_DISPLAY,
|
PROP_DISPLAY,
|
||||||
PROP_FRAME_CLOCK,
|
|
||||||
PROP_PARENT,
|
PROP_PARENT,
|
||||||
LAST_PROP
|
LAST_PROP
|
||||||
};
|
};
|
||||||
@ -212,13 +209,6 @@ gtk_style_context_class_init (GtkStyleContextClass *klass)
|
|||||||
GDK_TYPE_DISPLAY,
|
GDK_TYPE_DISPLAY,
|
||||||
GTK_PARAM_READWRITE);
|
GTK_PARAM_READWRITE);
|
||||||
|
|
||||||
properties[PROP_FRAME_CLOCK] =
|
|
||||||
g_param_spec_object ("paint-clock",
|
|
||||||
P_("FrameClock"),
|
|
||||||
P_("The associated GdkFrameClock"),
|
|
||||||
GDK_TYPE_FRAME_CLOCK,
|
|
||||||
GTK_PARAM_READWRITE);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* GtkStyleContext:parent:
|
* GtkStyleContext:parent:
|
||||||
*
|
*
|
||||||
@ -344,9 +334,6 @@ gtk_style_context_impl_set_property (GObject *object,
|
|||||||
case PROP_DISPLAY:
|
case PROP_DISPLAY:
|
||||||
gtk_style_context_set_display (context, g_value_get_object (value));
|
gtk_style_context_set_display (context, g_value_get_object (value));
|
||||||
break;
|
break;
|
||||||
case PROP_FRAME_CLOCK:
|
|
||||||
gtk_style_context_set_frame_clock (context, g_value_get_object (value));
|
|
||||||
break;
|
|
||||||
case PROP_PARENT:
|
case PROP_PARENT:
|
||||||
gtk_style_context_set_parent (context, g_value_get_object (value));
|
gtk_style_context_set_parent (context, g_value_get_object (value));
|
||||||
break;
|
break;
|
||||||
@ -370,9 +357,6 @@ gtk_style_context_impl_get_property (GObject *object,
|
|||||||
case PROP_DISPLAY:
|
case PROP_DISPLAY:
|
||||||
g_value_set_object (value, priv->display);
|
g_value_set_object (value, priv->display);
|
||||||
break;
|
break;
|
||||||
case PROP_FRAME_CLOCK:
|
|
||||||
g_value_set_object (value, priv->frame_clock);
|
|
||||||
break;
|
|
||||||
case PROP_PARENT:
|
case PROP_PARENT:
|
||||||
g_value_set_object (value, priv->parent);
|
g_value_set_object (value, priv->parent);
|
||||||
break;
|
break;
|
||||||
@ -1344,51 +1328,6 @@ gtk_style_context_get_display (GtkStyleContext *context)
|
|||||||
return priv->display;
|
return priv->display;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* gtk_style_context_set_frame_clock:
|
|
||||||
* @context: a #GdkFrameClock
|
|
||||||
* @frame_clock: a #GdkFrameClock
|
|
||||||
*
|
|
||||||
* Attaches @context to the given frame clock.
|
|
||||||
*
|
|
||||||
* The frame clock is used for the timing of animations.
|
|
||||||
*
|
|
||||||
* If you are using a #GtkStyleContext returned from
|
|
||||||
* gtk_widget_get_style_context(), you do not need to
|
|
||||||
* call this yourself.
|
|
||||||
**/
|
|
||||||
void
|
|
||||||
gtk_style_context_set_frame_clock (GtkStyleContext *context,
|
|
||||||
GdkFrameClock *frame_clock)
|
|
||||||
{
|
|
||||||
GtkStyleContextPrivate *priv = gtk_style_context_get_instance_private (context);
|
|
||||||
|
|
||||||
g_return_if_fail (GTK_IS_STYLE_CONTEXT (context));
|
|
||||||
g_return_if_fail (frame_clock == NULL || GDK_IS_FRAME_CLOCK (frame_clock));
|
|
||||||
|
|
||||||
if (g_set_object (&priv->frame_clock, frame_clock))
|
|
||||||
g_object_notify_by_pspec (G_OBJECT (context), properties[PROP_FRAME_CLOCK]);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* gtk_style_context_get_frame_clock:
|
|
||||||
* @context: a #GtkStyleContext
|
|
||||||
*
|
|
||||||
* Returns the #GdkFrameClock to which @context is attached.
|
|
||||||
*
|
|
||||||
* Returns: (nullable) (transfer none): a #GdkFrameClock, or %NULL
|
|
||||||
* if @context does not have an attached frame clock.
|
|
||||||
**/
|
|
||||||
GdkFrameClock *
|
|
||||||
gtk_style_context_get_frame_clock (GtkStyleContext *context)
|
|
||||||
{
|
|
||||||
GtkStyleContextPrivate *priv = gtk_style_context_get_instance_private (context);
|
|
||||||
|
|
||||||
g_return_val_if_fail (GTK_IS_STYLE_CONTEXT (context), NULL);
|
|
||||||
|
|
||||||
return priv->frame_clock;
|
|
||||||
}
|
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
_gtk_style_context_resolve_color (GtkStyleContext *context,
|
_gtk_style_context_resolve_color (GtkStyleContext *context,
|
||||||
GtkCssValue *color,
|
GtkCssValue *color,
|
||||||
|
@ -1018,12 +1018,6 @@ void gtk_style_context_set_display (GtkStyleContext *context,
|
|||||||
GDK_AVAILABLE_IN_ALL
|
GDK_AVAILABLE_IN_ALL
|
||||||
GdkDisplay *gtk_style_context_get_display (GtkStyleContext *context);
|
GdkDisplay *gtk_style_context_get_display (GtkStyleContext *context);
|
||||||
|
|
||||||
GDK_AVAILABLE_IN_ALL
|
|
||||||
void gtk_style_context_set_frame_clock (GtkStyleContext *context,
|
|
||||||
GdkFrameClock *frame_clock);
|
|
||||||
GDK_AVAILABLE_IN_ALL
|
|
||||||
GdkFrameClock *gtk_style_context_get_frame_clock (GtkStyleContext *context);
|
|
||||||
|
|
||||||
GDK_AVAILABLE_IN_ALL
|
GDK_AVAILABLE_IN_ALL
|
||||||
gboolean gtk_style_context_lookup_color (GtkStyleContext *context,
|
gboolean gtk_style_context_lookup_color (GtkStyleContext *context,
|
||||||
const gchar *color_name,
|
const gchar *color_name,
|
||||||
|
@ -3656,9 +3656,6 @@ gtk_widget_connect_frame_clock (GtkWidget *widget)
|
|||||||
}
|
}
|
||||||
|
|
||||||
gtk_css_node_invalidate_frame_clock (priv->cssnode, FALSE);
|
gtk_css_node_invalidate_frame_clock (priv->cssnode, FALSE);
|
||||||
|
|
||||||
if (priv->context)
|
|
||||||
gtk_style_context_set_frame_clock (priv->context, frame_clock);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -3681,9 +3678,6 @@ gtk_widget_disconnect_frame_clock (GtkWidget *widget)
|
|||||||
priv->clock_tick_id = 0;
|
priv->clock_tick_id = 0;
|
||||||
gdk_frame_clock_end_updating (frame_clock);
|
gdk_frame_clock_end_updating (frame_clock);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (priv->context)
|
|
||||||
gtk_style_context_set_frame_clock (priv->context, NULL);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -12208,7 +12202,6 @@ gtk_widget_get_style_context (GtkWidget *widget)
|
|||||||
if (G_UNLIKELY (priv->context == NULL))
|
if (G_UNLIKELY (priv->context == NULL))
|
||||||
{
|
{
|
||||||
GdkDisplay *display;
|
GdkDisplay *display;
|
||||||
GdkFrameClock *frame_clock;
|
|
||||||
|
|
||||||
priv->context = gtk_style_context_new_for_node (priv->cssnode);
|
priv->context = gtk_style_context_new_for_node (priv->cssnode);
|
||||||
|
|
||||||
@ -12220,10 +12213,6 @@ gtk_widget_get_style_context (GtkWidget *widget)
|
|||||||
if (display)
|
if (display)
|
||||||
gtk_style_context_set_display (priv->context, display);
|
gtk_style_context_set_display (priv->context, display);
|
||||||
|
|
||||||
frame_clock = gtk_widget_get_frame_clock (widget);
|
|
||||||
if (frame_clock)
|
|
||||||
gtk_style_context_set_frame_clock (priv->context, frame_clock);
|
|
||||||
|
|
||||||
if (priv->parent)
|
if (priv->parent)
|
||||||
gtk_style_context_set_parent (priv->context,
|
gtk_style_context_set_parent (priv->context,
|
||||||
_gtk_widget_get_style_context (priv->parent));
|
_gtk_widget_get_style_context (priv->parent));
|
||||||
|
Loading…
Reference in New Issue
Block a user