[gtk+/wip/baedert/drawing: 315/355] range: Fix mark positions
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/baedert/drawing: 315/355] range: Fix mark positions
- Date: Tue, 11 Jul 2017 16:54:48 +0000 (UTC)
commit 5a8718ec763a44482282904be707371bef2f7ed6
Author: Timm Bäder <mail baedert org>
Date: Fri Jun 30 13:10:32 2017 +0200
range: Fix mark positions
The values returned by gtk_range_compute_slider_position are relative
to the trough_widget (the slider's parent), not the slider widget
itself.
gtk/gtkrange.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index 2c4d208..0a5fbc1 100644
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -1760,7 +1760,6 @@ range_grab_add (GtkRange *range,
* is the only widget receiving the pointer events.
*/
priv->grab_location = location;
- gtk_widget_queue_resize (location);
update_trough_state (range);
update_slider_state (range);
@@ -1795,7 +1794,6 @@ range_grab_remove (GtkRange *range)
context = gtk_widget_get_style_context (GTK_WIDGET (range));
- gtk_widget_queue_resize (priv->grab_location);
priv->grab_location = NULL;
gtk_range_update_mouse_location (range);
@@ -2910,7 +2908,7 @@ gtk_range_calc_marks (GtkRange *range)
for (i = 0; i < priv->n_marks; i++)
{
gtk_range_compute_slider_position (range, priv->marks[i], &slider);
- gtk_widget_translate_coordinates (priv->slider_widget, GTK_WIDGET (range),
+ gtk_widget_translate_coordinates (priv->trough_widget, GTK_WIDGET (range),
slider.x, slider.y, &slider.x, &slider.y);
if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]