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

canonicalize the name of the "activate-slider" style property and use

Browse Source 
2006-05-18  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkrange.c: canonicalize the name of the "activate-slider"
	style property and use GTK_PARAM_READABLE instead of
	G_PARAM_READABLE. Moved one "activate_slider" variable to the
	local scope its used in.
This commit is contained in:
Michael Natterer
2006-05-18 11:39:42 +00:00
committed by Michael Natterer
parent bc0f858deb
commit 928dd09524
3 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2006-05-18 Michael Natterer <mitch@imendio.com>
* gtk/gtkrange.c: canonicalize the name of the "activate-slider"
style property and use GTK_PARAM_READABLE instead of
G_PARAM_READABLE. Moved one "activate_slider" variable to the
local scope its used in.
2006-06-18 Michael Emmel <mike.emmel@gmail.com> 2006-06-18 Michael Emmel <mike.emmel@gmail.com>
* gdk/directfb/gdkscreen-directfb.c: * gdk/directfb/gdkscreen-directfb.c:

7
ChangeLog.pre-2-10
View File

@ -1,3 +1,10 @@
2006-05-18 Michael Natterer <mitch@imendio.com>
* gtk/gtkrange.c: canonicalize the name of the "activate-slider"
style property and use GTK_PARAM_READABLE instead of
G_PARAM_READABLE. Moved one "activate_slider" variable to the
local scope its used in.
2006-06-18 Michael Emmel <mike.emmel@gmail.com> 2006-06-18 Michael Emmel <mike.emmel@gmail.com>
* gdk/directfb/gdkscreen-directfb.c: * gdk/directfb/gdkscreen-directfb.c:

15
gtk/gtkrange.c
View File

@ -393,11 +393,11 @@ gtk_range_class_init (GtkRangeClass *class)
GTK_PARAM_READABLE)); GTK_PARAM_READABLE));
gtk_widget_class_install_style_property (widget_class, gtk_widget_class_install_style_property (widget_class,
g_param_spec_boolean ("activate_slider", g_param_spec_boolean ("activate-slider",
P_("Draw slider ACTIVE during drag"), P_("Draw slider ACTIVE during drag"),
P_("With this option set to TRUE, sliders will be drawn ACTIVE and with shadow IN while they are dragged"), P_("With this option set to TRUE, sliders will be drawn ACTIVE and with shadow IN while they are dragged"),
FALSE, FALSE,
G_PARAM_READABLE)); GTK_PARAM_READABLE));
} }
static void static void
@ -1134,7 +1134,6 @@ gtk_range_expose (GtkWidget *widget,
gint focus_line_width = 0; gint focus_line_width = 0;
gint focus_padding = 0; gint focus_padding = 0;
gboolean touchscreen; gboolean touchscreen;
gboolean activate_slider;
g_object_get (gtk_widget_get_settings (widget), g_object_get (gtk_widget_get_settings (widget),
"gtk-touchscreen-mode", &touchscreen, "gtk-touchscreen-mode", &touchscreen,
@ -1203,7 +1202,9 @@ gtk_range_expose (GtkWidget *widget,
if (range->layout->grab_location == MOUSE_SLIDER) if (range->layout->grab_location == MOUSE_SLIDER)
{ {
gtk_widget_style_get (widget, "activate_slider", &activate_slider, NULL); gboolean activate_slider;
gtk_widget_style_get (widget, "activate-slider", &activate_slider, NULL);
if (activate_slider) if (activate_slider)
{ {
@ -1519,9 +1520,11 @@ gtk_range_button_press (GtkWidget *widget,
range_grab_add (range, MOUSE_SLIDER, event->button); range_grab_add (range, MOUSE_SLIDER, event->button);
gtk_widget_style_get (widget, "activate_slider", &activate_slider, NULL); gtk_widget_style_get (widget, "activate-slider", &activate_slider, NULL);
/* force a redraw, if the active slider is drawn differently to the prelight one */ /* force a redraw, if the active slider is drawn differently to the
* prelight one
*/
if (activate_slider) if (activate_slider)
gtk_widget_queue_draw (widget); gtk_widget_queue_draw (widget);