[Player-cvs] app/gtk superbufhscale.cpp,1.3.6.4,1.3.6.5
dyek at helixcommunity.org dyek at helixcommunity.orgUpdate of /cvsroot/player/app/gtk
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv4025
Modified Files:
Tag: hxclient_3_1_0_atlas
superbufhscale.cpp
Log Message:
As all 3 computations that use:
hx_superbuf_hscale_adjustment_value_to_slider_x()
are affected by the inclusion of widget allocation x-coord,
the previous fix was reverted and fixed differently in:
hx_superbuf_hscale_adjustment_value_to_slider_x()
itself as it should be.
Now, the layout x-coord. is calculated without widget allocation x-coord.
Refer to the following for more information:
http://lists.helixcommunity.org/pipermail/player-dev/2008-October/003943.html
Index: superbufhscale.cpp
===================================================================
RCS file: /cvsroot/player/app/gtk/superbufhscale.cpp,v
retrieving revision 1.3.6.4
retrieving revision 1.3.6.5
diff -u -d -r1.3.6.4 -r1.3.6.5
--- superbufhscale.cpp 9 Oct 2008 21:28:15 -0000 1.3.6.4
+++ superbufhscale.cpp 9 Oct 2008 22:19:03 -0000 1.3.6.5
@@ -129,7 +129,7 @@
static guint signals[LAST_SIGNAL];
-// Convert GtkAdjustment value to slider x window coordinate.
+// Convert GtkAdjustment value to slider x widget coordinate.
gint
hx_superbuf_hscale_adjustment_value_to_slider_x(HXSuperbufHScale *superbuf_hscale,
gdouble value)
@@ -142,7 +142,7 @@
layout = &superbuf_hscale->layout;
widget = GTK_WIDGET(superbuf_hscale);
- x = widget->allocation.x + layout->trough_rect.x;
+ x = layout->trough_rect.x;
if ( (superbuf_hscale->adjustment->upper - superbuf_hscale->adjustment->lower) <= 0)
{