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

gtk: Allow hiding the trough/slider in GtkScale

Browse Source 
When setting a GtkRange's upper and lower values to the same
value, the slider will not be drawn any more.

https://bugzilla.gnome.org/show_bug.cgi?id=549720
This commit is contained in:
Bastien Nocera
2010-11-22 17:46:25 +00:00
parent 926622e2dd
commit 959fc60c47
3 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gtk/gtkrange.c
View File

@ -1280,7 +1280,7 @@ gtk_range_set_range (GtkRange *range,
gdouble value;
g_return_if_fail (GTK_IS_RANGE (range));
g_return_if_fail (min < max);
g_return_if_fail (min <= max);
priv = range->priv;
@ -2016,11 +2016,16 @@ gtk_range_draw (GtkWidget *widget,
gint focus_line_width = 0;
gint focus_padding = 0;
gboolean touchscreen;
gboolean draw_trough = TRUE;
g_object_get (gtk_widget_get_settings (widget),
"gtk-touchscreen-mode", &touchscreen,
NULL);
if (GTK_IS_SCALE (widget) &&
priv->adjustment->upper == priv->adjustment->lower)
draw_trough = FALSE;
style = gtk_widget_get_style (widget);
if (gtk_widget_get_can_focus (GTK_WIDGET (range)))
gtk_widget_style_get (GTK_WIDGET (range),
@ -2112,6 +2117,7 @@ gtk_range_draw (GtkWidget *widget,
}
}
if (draw_trough)
{
gint trough_change_pos_x = width;
gint trough_change_pos_y = height;
@ -2147,6 +2153,17 @@ gtk_range_draw (GtkWidget *widget,
width - trough_change_pos_x,
height - trough_change_pos_y);
}
else
{
gtk_paint_box (style, cr,
sensitive ? GTK_STATE_ACTIVE : GTK_STATE_INSENSITIVE,
GTK_SHADOW_IN,
GTK_WIDGET (range),
"trough-upper",
x, y,
width,
height);
}
if (priv->show_fill_level &&
priv->adjustment->upper - priv->adjustment->page_size -
@ -2236,6 +2253,7 @@ gtk_range_draw (GtkWidget *widget,
gdk_cairo_rectangle (cr, &priv->slider);
cairo_clip (cr);
if (draw_trough)
{
gtk_paint_slider (style,
cr,