[gtk+] Cosmetic: Avoid explict state variables
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Cosmetic: Avoid explict state variables
- Date: Sat, 14 Nov 2015 17:56:30 +0000 (UTC)
commit beb28754377e960e7c9029c188cd8cf85da93ebd
Author: Matthias Clasen <mclasen redhat com>
Date: Sat Nov 14 09:56:12 2015 -0500
Cosmetic: Avoid explict state variables
Using the state of the context makes this more obviously correct.
gtk/gtkmenubar.c | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c
index 8e28f3b..6066b2e 100644
--- a/gtk/gtkmenubar.c
+++ b/gtk/gtkmenubar.c
@@ -325,7 +325,6 @@ gtk_menu_bar_size_request (GtkWidget *widget,
gint child_minimum, child_natural;
GtkStyleContext *context;
GtkBorder border;
- GtkStateFlags flags;
*minimum = 0;
*natural = 0;
@@ -382,8 +381,7 @@ gtk_menu_bar_size_request (GtkWidget *widget,
}
context = gtk_widget_get_style_context (widget);
- flags = gtk_widget_get_state_flags (widget);
- gtk_style_context_get_padding (context, flags, &border);
+ gtk_style_context_get_padding (context, gtk_style_context_get_state (context), &border);
if (orientation == GTK_ORIENTATION_HORIZONTAL)
{
@@ -402,7 +400,7 @@ gtk_menu_bar_size_request (GtkWidget *widget,
if (get_shadow_type (menu_bar) != GTK_SHADOW_NONE)
{
- gtk_style_context_get_border (context, flags, &border);
+ gtk_style_context_get_border (context, gtk_style_context_get_state (context), &border);
if (orientation == GTK_ORIENTATION_HORIZONTAL)
{
@@ -483,12 +481,10 @@ gtk_menu_bar_size_allocate (GtkWidget *widget,
if (menu_shell->priv->children)
{
GtkStyleContext *context;
- GtkStateFlags flags;
GtkBorder border;
context = gtk_widget_get_style_context (widget);
- flags = gtk_widget_get_state_flags (widget);
- gtk_style_context_get_padding (context, flags, &border);
+ gtk_style_context_get_padding (context, gtk_style_context_get_state (context), &border);
border_width = gtk_container_get_border_width (GTK_CONTAINER (menu_bar));
@@ -501,7 +497,7 @@ gtk_menu_bar_size_allocate (GtkWidget *widget,
if (get_shadow_type (menu_bar) != GTK_SHADOW_NONE)
{
- gtk_style_context_get_border (context, flags, &border);
+ gtk_style_context_get_border (context, gtk_style_context_get_state (context), &border);
remaining_space.x += border.left;
remaining_space.y += border.top;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]