mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-09-29 18:47:38 +00:00
Cosmetic: Avoid explicit state variables
Using the state of the context makes this more obviously correct.
This commit is contained in:
parent
beb2875437
commit
eca9549c72
@ -878,7 +878,6 @@ gtk_menu_item_get_preferred_width (GtkWidget *widget,
|
|||||||
guint border_width;
|
guint border_width;
|
||||||
gint min_width, nat_width;
|
gint min_width, nat_width;
|
||||||
GtkStyleContext *context;
|
GtkStyleContext *context;
|
||||||
GtkStateFlags state;
|
|
||||||
GtkBorder padding;
|
GtkBorder padding;
|
||||||
|
|
||||||
bin = GTK_BIN (widget);
|
bin = GTK_BIN (widget);
|
||||||
@ -887,8 +886,7 @@ gtk_menu_item_get_preferred_width (GtkWidget *widget,
|
|||||||
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
|
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
|
||||||
|
|
||||||
context = gtk_widget_get_style_context (widget);
|
context = gtk_widget_get_style_context (widget);
|
||||||
state = gtk_widget_get_state_flags (widget);
|
gtk_style_context_get_padding (context, gtk_style_context_get_state (context), &padding);
|
||||||
gtk_style_context_get_padding (context, state, &padding);
|
|
||||||
|
|
||||||
min_width = (border_width * 2) + padding.left + padding.right;
|
min_width = (border_width * 2) + padding.left + padding.right;
|
||||||
nat_width = min_width;
|
nat_width = min_width;
|
||||||
@ -938,7 +936,6 @@ gtk_menu_item_real_get_height (GtkWidget *widget,
|
|||||||
GtkMenuItemPrivate *priv = menu_item->priv;
|
GtkMenuItemPrivate *priv = menu_item->priv;
|
||||||
GtkBin *bin;
|
GtkBin *bin;
|
||||||
GtkStyleContext *context;
|
GtkStyleContext *context;
|
||||||
GtkStateFlags state;
|
|
||||||
GtkBorder padding;
|
GtkBorder padding;
|
||||||
GtkWidget *child;
|
GtkWidget *child;
|
||||||
GtkWidget *parent;
|
GtkWidget *parent;
|
||||||
@ -950,8 +947,7 @@ gtk_menu_item_real_get_height (GtkWidget *widget,
|
|||||||
min_height = nat_height = 0;
|
min_height = nat_height = 0;
|
||||||
|
|
||||||
context = gtk_widget_get_style_context (widget);
|
context = gtk_widget_get_style_context (widget);
|
||||||
state = gtk_widget_get_state_flags (widget);
|
gtk_style_context_get_padding (context, gtk_style_context_get_state (context), &padding);
|
||||||
gtk_style_context_get_padding (context, state, &padding);
|
|
||||||
|
|
||||||
bin = GTK_BIN (widget);
|
bin = GTK_BIN (widget);
|
||||||
parent = gtk_widget_get_parent (widget);
|
parent = gtk_widget_get_parent (widget);
|
||||||
@ -1569,13 +1565,11 @@ gtk_menu_item_size_allocate (GtkWidget *widget,
|
|||||||
if (child)
|
if (child)
|
||||||
{
|
{
|
||||||
GtkStyleContext *context;
|
GtkStyleContext *context;
|
||||||
GtkStateFlags state;
|
|
||||||
GtkBorder padding;
|
GtkBorder padding;
|
||||||
guint border_width;
|
guint border_width;
|
||||||
|
|
||||||
context = gtk_widget_get_style_context (widget);
|
context = gtk_widget_get_style_context (widget);
|
||||||
state = gtk_widget_get_state_flags (widget);
|
gtk_style_context_get_padding (context, gtk_style_context_get_state (context), &padding);
|
||||||
gtk_style_context_get_padding (context, state, &padding);
|
|
||||||
|
|
||||||
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
|
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
|
||||||
child_allocation.x = border_width + padding.left;
|
child_allocation.x = border_width + padding.left;
|
||||||
@ -1726,14 +1720,12 @@ gtk_menu_item_draw (GtkWidget *widget,
|
|||||||
{
|
{
|
||||||
GtkMenuItem *menu_item = GTK_MENU_ITEM (widget);
|
GtkMenuItem *menu_item = GTK_MENU_ITEM (widget);
|
||||||
GtkMenuItemPrivate *priv = menu_item->priv;
|
GtkMenuItemPrivate *priv = menu_item->priv;
|
||||||
GtkStateFlags state;
|
|
||||||
GtkStyleContext *context;
|
GtkStyleContext *context;
|
||||||
GtkBorder padding;
|
GtkBorder padding;
|
||||||
GtkWidget *child, *parent;
|
GtkWidget *child, *parent;
|
||||||
gint x, y, w, h, width, height;
|
gint x, y, w, h, width, height;
|
||||||
guint border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
|
guint border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
|
||||||
|
|
||||||
state = gtk_widget_get_state_flags (widget);
|
|
||||||
context = gtk_widget_get_style_context (widget);
|
context = gtk_widget_get_style_context (widget);
|
||||||
width = gtk_widget_get_allocated_width (widget);
|
width = gtk_widget_get_allocated_width (widget);
|
||||||
height = gtk_widget_get_allocated_height (widget);
|
height = gtk_widget_get_allocated_height (widget);
|
||||||
@ -1746,7 +1738,7 @@ gtk_menu_item_draw (GtkWidget *widget,
|
|||||||
child = gtk_bin_get_child (GTK_BIN (menu_item));
|
child = gtk_bin_get_child (GTK_BIN (menu_item));
|
||||||
parent = gtk_widget_get_parent (widget);
|
parent = gtk_widget_get_parent (widget);
|
||||||
|
|
||||||
gtk_style_context_get_padding (context, state, &padding);
|
gtk_style_context_get_padding (context, gtk_style_context_get_state (context), &padding);
|
||||||
|
|
||||||
gtk_render_background (context, cr, x, y, w, h);
|
gtk_render_background (context, cr, x, y, w, h);
|
||||||
gtk_render_frame (context, cr, x, y, w, h);
|
gtk_render_frame (context, cr, x, y, w, h);
|
||||||
@ -2139,7 +2131,6 @@ get_offsets (GtkMenu *menu,
|
|||||||
gint *vertical_offset)
|
gint *vertical_offset)
|
||||||
{
|
{
|
||||||
GtkStyleContext *context;
|
GtkStyleContext *context;
|
||||||
GtkStateFlags state;
|
|
||||||
GtkBorder padding;
|
GtkBorder padding;
|
||||||
|
|
||||||
gtk_widget_style_get (GTK_WIDGET (menu),
|
gtk_widget_style_get (GTK_WIDGET (menu),
|
||||||
@ -2148,8 +2139,7 @@ get_offsets (GtkMenu *menu,
|
|||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
context = gtk_widget_get_style_context (GTK_WIDGET (menu));
|
context = gtk_widget_get_style_context (GTK_WIDGET (menu));
|
||||||
state = gtk_widget_get_state_flags (GTK_WIDGET (menu));
|
gtk_style_context_get_padding (context, gtk_style_context_get_state (context), &padding);
|
||||||
gtk_style_context_get_padding (context, state, &padding);
|
|
||||||
|
|
||||||
*vertical_offset -= padding.top;
|
*vertical_offset -= padding.top;
|
||||||
*horizontal_offset += padding.left;
|
*horizontal_offset += padding.left;
|
||||||
@ -2178,7 +2168,6 @@ gtk_menu_item_position_menu (GtkMenu *menu,
|
|||||||
gint vertical_offset;
|
gint vertical_offset;
|
||||||
gint available_left, available_right;
|
gint available_left, available_right;
|
||||||
GtkStyleContext *context;
|
GtkStyleContext *context;
|
||||||
GtkStateFlags state;
|
|
||||||
GtkBorder parent_padding;
|
GtkBorder parent_padding;
|
||||||
|
|
||||||
g_return_if_fail (menu != NULL);
|
g_return_if_fail (menu != NULL);
|
||||||
@ -2247,8 +2236,7 @@ gtk_menu_item_position_menu (GtkMenu *menu,
|
|||||||
parent_menu_item = NULL;
|
parent_menu_item = NULL;
|
||||||
|
|
||||||
context = gtk_widget_get_style_context (parent);
|
context = gtk_widget_get_style_context (parent);
|
||||||
state = gtk_widget_get_state_flags (parent);
|
gtk_style_context_get_padding (context, gtk_style_context_get_state (context), &parent_padding);
|
||||||
gtk_style_context_get_padding (context, state, &parent_padding);
|
|
||||||
|
|
||||||
if (parent_menu_item && !GTK_MENU (parent)->priv->torn_off)
|
if (parent_menu_item && !GTK_MENU (parent)->priv->torn_off)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user