summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2013-11-18 01:37:44 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2013-11-24 21:30:34 +0100
commitf71923b96a936c78b6387222e7c93a654d31536a (patch)
tree64cd4729106b274ad61e35fe5e21e5ecf7e01ca4
parentb758380650c166aaccc98cfd5e739c18bb2228fc (diff)
downloaddrakx-kbd-mouse-x11-f71923b96a936c78b6387222e7c93a654d31536a.tar
drakx-kbd-mouse-x11-f71923b96a936c78b6387222e7c93a654d31536a.tar.gz
drakx-kbd-mouse-x11-f71923b96a936c78b6387222e7c93a654d31536a.tar.bz2
drakx-kbd-mouse-x11-f71923b96a936c78b6387222e7c93a654d31536a.tar.xz
drakx-kbd-mouse-x11-f71923b96a936c78b6387222e7c93a654d31536a.zip
get_height() => get_allocated_height()
-rw-r--r--lib/Xconfig/test.pm2
-rw-r--r--lib/mouse.pm6
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/Xconfig/test.pm b/lib/Xconfig/test.pm
index 36b0e30..2bdd7cc 100644
--- a/lib/Xconfig/test.pm
+++ b/lib/Xconfig/test.pm
@@ -114,7 +114,7 @@ sub test {
my $root = gtkroot();
my $gc = Gtk3::Gdk::GC->new($root);
my $pixbuf = Gtk3::Gdk::Pixbuf->new_from_file("$::prefix/usr/share/mga/xfdrake/xfdrake-test-card.png");
- my ($w, $h) = ($pixbuf->get_width, $pixbuf->get_height);
+ my ($w, $h) = ($pixbuf->get_width, $pixbuf->get_allocated_height);
my $pixmap = Gtk3::Gdk::Pixmap->new($root, $w, $h, $root->get_depth);
$pixbuf->render_to_drawable($pixmap, $gc, 0, 0, 0, 0, $w, $h, 'none', 0, 0);
$root->set_back_pixmap($pixmap, 0);
diff --git a/lib/mouse.pm b/lib/mouse.pm
index 0c76659..d57922e 100644
--- a/lib/mouse.pm
+++ b/lib/mouse.pm
@@ -579,7 +579,7 @@ sub test_mouse {
down => 'arrow_down');
my %images = map { $_ => ugtk3::gtkcreate_pixbuf("$image_files{$_}.png") } keys %image_files;
my $width = $images{mouse}->get_width;
- my $height = round_up($images{mouse}->get_height, 6);
+ my $height = round_up($images{mouse}->get_allocated_height, 6);
my $draw_text = sub {
my ($t, $y) = @_;
@@ -593,7 +593,7 @@ sub test_mouse {
my $draw_pixbuf = sub {
my ($p, $x, $y, $w, $h) = @_;
$w = $p->get_width;
- $h = $p->get_height;
+ $h = $p->get_allocated_height;
$p->render_to_drawable($darea->get_window, $darea->style->bg_gc('normal'), 0, 0,
($darea->get_allocation->width-$width)/2 + $x, ($darea->get_allocation->height-$height)/2 + $y,
$w, $h, 'none', 0, 0);
@@ -637,7 +637,7 @@ sub test_mouse {
if ($nb == 3) {
$draw_pixbuf->($images{up}, $x+6, $y-10);
} elsif ($nb == 4) {
- $draw_pixbuf->($images{down}, $x+6, $y + $images{middle}->get_height + 2);
+ $draw_pixbuf->($images{down}, $x+6, $y + $images{middle}->get_allocated_height + 2);
}
$draw_by_name->('middle');
$timeout and Glib::Source->remove($timeout);