summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2016-11-02 15:45:20 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-11-02 16:06:02 +0100
commit0ce4b49fbc58931afc0ee6bb3647aef97b4b2039 (patch)
tree57e4c503837ffd70d4735920560db89be85757b5
parentb22f0a29c267ea925edcbb0650494b419bf5c3e2 (diff)
downloadcontrol-center-0ce4b49fbc58931afc0ee6bb3647aef97b4b2039.tar
control-center-0ce4b49fbc58931afc0ee6bb3647aef97b4b2039.tar.gz
control-center-0ce4b49fbc58931afc0ee6bb3647aef97b4b2039.tar.bz2
control-center-0ce4b49fbc58931afc0ee6bb3647aef97b4b2039.tar.xz
control-center-0ce4b49fbc58931afc0ee6bb3647aef97b4b2039.zip
kill {size}
thus fix centering wait message + blinking icon while loading a tool
-rw-r--r--NEWS1
-rwxr-xr-xcontrol-center5
2 files changed, 2 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index c9e0b69c..9a1ef761 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+- fix centering wait message + blinking icon while loading a tool
- fix display "please wait" message while loading a tool
Version 13.8 - 31 October 2016, Thierry Vignaud
diff --git a/control-center b/control-center
index 208be5d0..3c42d00e 100755
--- a/control-center
+++ b/control-center
@@ -1053,10 +1053,9 @@ $wait_darea->signal_connect(draw => sub {
my ($w, $cr) = @_;
return if !$wait_darea->get_realized;
return unless $run_pixbuf; # some people got an expose event before we start an embedded tool
- return unless $wait_darea->{size};
$wait_darea->{layout} ||= $wait_darea->create_pango_layout(N("Loading... Please wait"));
my $pixbuf = $run_pixbufs{$run_counter} ||= mygtk3::_pixbuf_render_alpha($run_pixbuf, $run_counter);
- my $size = $wait_darea->{size};
+ my $size = $wait_darea->get_allocation;
my ($d_width, $d_height) = ($size->{width}, $size->{height});
($w->{pix_width}, $w->{pix_height}) = ($pixbuf->get_width, $pixbuf->get_height);
my ($txt_width, $txt_height) = $wait_darea->{layout}->get_pixel_size;
@@ -1253,8 +1252,6 @@ sub run_tool {
$run_pixbuf = eval { gtkcreate_pixbuf($icon . "_128") };
$run_counter = 255;
$run_counter_add = -5;
- undef $wait_darea->{size};
- $wait_darea->{size} = $wait_darea->get_allocation;
$timeout = Glib::Timeout->add(35, sub {
my $w = $wait_darea;
$w->queue_draw_area($w->{pix_yy}, $w->{pix_xx}, $w->{pix_width}, $w->{pix_height});