(move_selection) better positionning of sidepanel's selection bar

instead of using hardcoded offset (mainly visible in MCC)

rationale: we pass the whole label widget as parameter so that we got
more control on how to compute the Y coordinate instead of requiring
callers to extract label's position from the widget

4 files changed, 7 insertions, 3 deletions

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 65063b03d..c032e0079 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- libDrakX:
+  o better positionning of mcc selection bar
 - draksplash:
   o fix crashing when altering read-only combo boxes
     (regression introduced in 11.37 on 2008-09-08)
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index da2ef822d..968adef69 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- better positionning of sidepanel's selection bar
+
 Version 11.56 - 26 September 2008
 
 - dmraid devices: use isw_xxxxp1 instead of isw_xxxx1 (see #42542, #44182)
diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm
index eb80cb083..ef3165543 100644
--- a/perl-install/install/gtk.pm
+++ b/perl-install/install/gtk.pm
@@ -172,7 +172,7 @@ sub update_steps_position {
 	if ($o->{steps}{$_}{entered} && !$o->{steps}{$_}{done}) {
             # we need to flush the X queue since else we got a temporary Y position of -1 when switching locales:
             mygtk2::flush(); #- for auto_installs which never go through the Gtk2 main loop
-            $o->{steps_widget}->move_selection($steps{steps}{$_}{text}->allocation->y);
+            $o->{steps_widget}->move_selection($steps{steps}{$_}{text});
 
             if ($last_step) {
                 $steps{steps}{$last_step}{img}->set_from_pixbuf($steps{done});
diff --git a/perl-install/mygtk2.pm b/perl-install/mygtk2.pm
index 96c153d2c..f218778bf 100644
--- a/perl-install/mygtk2.pm
+++ b/perl-install/mygtk2.pm
@@ -1478,11 +1478,11 @@ sub hide_selection {
 }
 
 sub move_selection {
-    my ($w, $y) = @_;
+    my ($w, $label) = @_;
     my $layout = $w->{layout};
     $layout->{arrow_ydiff} ||=
       ($w->{selection_arrow}->get_pixbuf->get_height - $w->{selection_bar}->get_pixbuf->get_height)/2;
-    my $bar_y = $y -3; # text's pos_y -3
+    my $bar_y = $label->allocation->y - ($w->{selection_bar}->get_pixbuf->get_height - $label->allocation->height)/2;
     $layout->move($w->{selection_bar}, 0, $bar_y);
     $layout->move($w->{selection_arrow}, $w->{arrow_x}, $bar_y - $layout->{arrow_ydiff}); # arrow is higer
     $_->show foreach $w->{selection_bar}, $w->{selection_arrow};