diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-01-26 18:58:17 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-01-26 18:58:17 +0000 |
| commit | 68caee60840939324fb811ce131ad21f787d9dcd (patch) | |
| tree | e82b4cc9c37e77ca092a049a3959e1afc872ae38 | |
| parent | 33fc1e904af49a6dd5d9211dd6332df9d0eedda1 (diff) | |
| download | drakx-68caee60840939324fb811ce131ad21f787d9dcd.tar drakx-68caee60840939324fb811ce131ad21f787d9dcd.tar.gz drakx-68caee60840939324fb811ce131ad21f787d9dcd.tar.bz2 drakx-68caee60840939324fb811ce131ad21f787d9dcd.tar.xz drakx-68caee60840939324fb811ce131ad21f787d9dcd.zip | |
(_gtk__Image) kill old gtk+ warnings that confuse people
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/mygtk2.pm | 13 |
2 files changed, 7 insertions, 7 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 272c7c22e..772748fba 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,4 @@ +- kill old gtk+ warnings that confuse people - include back urpmi translations Version 13.78 - 24 January 2012 diff --git a/perl-install/mygtk2.pm b/perl-install/mygtk2.pm index a8d0a10c9..73f223f0e 100644 --- a/perl-install/mygtk2.pm +++ b/perl-install/mygtk2.pm @@ -345,7 +345,6 @@ sub _gtk__Image { my ($width, $height) = ($pixbuf->get_width, $pixbuf->get_height); $w->set_size_request($width, $height); $w->{pixbuf} = $pixbuf; - my $not_my_first_event; $w->signal_connect(expose_event => sub { my (undef, $event) = @_; if (!$w->{x}) { @@ -353,17 +352,17 @@ sub _gtk__Image { $w->{x} = $alloc->x; $w->{y} = $alloc->y; } + # workaround Gtk+ bug: in installer, first event is not complete and rectables are bogus: + if ($::isInstall) { + $pixbuf->render_to_drawable($w->window, $w->style->fg_gc('normal'), + 0, 0, $w->{x}, $w->{y}, $width, $height, 'max', 0, 0); + return; + } foreach my $rect($event->region->get_rectangles) { my @values = $rect->values; $pixbuf->render_to_drawable($w->window, $w->style->fg_gc('normal'), @values[0..1], $w->{x}+$values[0], $w->{y}+$values[1], @values[2..3], 'max', 0, 0); } - # workaround Gtk+ bug: in installer, first event is not complete: - if ($::isInstall && !$not_my_first_event) { - $not_my_first_event = 1; - $pixbuf->render_to_drawable($w->window, $w->style->fg_gc('normal'), - 0, 0, $w->{x}, $w->{y}, $width, $height, 'max', 0, 0); - } }); } : sub { my ($w, $file, $o_size) = @_; |