callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

calendar: Use the widget state flags as a base for drawing days

Browse Source 
Instead of building a set of state flags specifically for drawing days, base
it on the underlying widget state flags.
This commit is contained in:
Rui Matos
2011-12-15 01:39:00 +00:00
parent e868b8d6ea
commit d84021a870
1 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
gtk/gtkcalendar.c
View File

@ -2590,6 +2590,7 @@ calendar_paint_day (GtkCalendar *calendar,
g_return_if_fail (col < 7);
context = gtk_widget_get_style_context (widget);
state = gtk_widget_get_state_flags (widget);
day = priv->day[row][col];
show_details = (priv->display_flags & GTK_CALENDAR_SHOW_DETAILS);
@ -2598,30 +2599,24 @@ calendar_paint_day (GtkCalendar *calendar,
gtk_style_context_save (context);
if (!gtk_widget_get_sensitive (widget))
state |= GTK_STATE_FLAG_INSENSITIVE;
state &= ~(GTK_STATE_FLAG_INCONSISTENT | GTK_STATE_FLAG_ACTIVE | GTK_STATE_FLAG_SELECTED);
if (priv->day_month[row][col] == MONTH_PREV ||
priv->day_month[row][col] == MONTH_NEXT)
state |= GTK_STATE_FLAG_INCONSISTENT;
else
{
if (gtk_widget_has_focus (widget))
state |= GTK_STATE_FLAG_FOCUSED;
if (priv->marked_date[day-1])
state |= GTK_STATE_FLAG_ACTIVE;
if (priv->day_month[row][col] == MONTH_PREV ||
priv->day_month[row][col] == MONTH_NEXT)
state |= GTK_STATE_FLAG_INCONSISTENT;
else
if (priv->selected_day == day)
{
if (priv->marked_date[day-1])
state |= GTK_STATE_FLAG_ACTIVE;
state |= GTK_STATE_FLAG_SELECTED;
if (priv->selected_day == day)
{
state |= GTK_STATE_FLAG_SELECTED;
gtk_style_context_set_state (context, state);
gtk_render_background (context, cr,
day_rect.x, day_rect.y,
day_rect.width, day_rect.height);
}
gtk_style_context_set_state (context, state);
gtk_render_background (context, cr,
day_rect.x, day_rect.y,
day_rect.width, day_rect.height);
}
}