summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2007-10-23 17:19:54 +0000
committerOlivier Blin <oblin@mandriva.com>2007-10-23 17:19:54 +0000
commitbbeea810431fd1e3c97d2b31d4148b1224de4bdc (patch)
tree89d2b8947426fc01b65ef5c2fcd20abe7571d9c1
parentde43395b454c0133a2d5e6d83c29bdf16bc45188 (diff)
downloaddrakx-bbeea810431fd1e3c97d2b31d4148b1224de4bdc.tar
drakx-bbeea810431fd1e3c97d2b31d4148b1224de4bdc.tar.gz
drakx-bbeea810431fd1e3c97d2b31d4148b1224de4bdc.tar.bz2
drakx-bbeea810431fd1e3c97d2b31d4148b1224de4bdc.tar.xz
drakx-bbeea810431fd1e3c97d2b31d4148b1224de4bdc.zip
fix buttons order under KDE when using compiz (by detecting kde-window-decorator)
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/ugtk2.pm3
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index fc0128cdf..c3ce25dd8 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- fix buttons order under KDE when using compiz (by detecting kde-window-decorator)
+
Version 10.5.0 - 15 October 2007, by Thierry Vignaud
- localedrake:
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index e88282175..6b00d9d90 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -519,7 +519,8 @@ sub create_okcancel {
$w->{wizcancel} = gtknew('Button', text => N("Cancel"), clicked => sub { die 'wizcancel' }) if $::isWizard && !$::isInstall;
if (!defined $wm_is_kde) {
require any;
- $wm_is_kde = !$::isInstall && any::running_window_manager() eq "kwin" || 0;
+ my $wm = any::running_window_manager();
+ $wm_is_kde = !$::isInstall && ($wm eq "kwin" || $wm eq "compiz" && fuzzy_pidofs(qr/\bkde-window-decorator\b/)) || 0;
}
my $f = sub { $w->{buttons}{$_[0][0]} = gtknew('Button', text => $_[0][0], clicked => $_[0][1]) };
my @left = ((map { $f->($_) } grep { $_->[2] && !$_->[3] } @other),