diff options
| author | Olivier Blin <oblin@mandriva.com> | 2007-10-23 17:37:06 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2007-10-23 17:37:06 +0000 |
| commit | ce983934eee38ee727ae3ad403dbefd86572a681 (patch) | |
| tree | a2becbf84cc4870174fc59720bf09d70de482b69 | |
| parent | b9e66e17e12d755211cbfb4f4253a13bc34a5472 (diff) | |
| download | drakx-backup-do-not-use-ce983934eee38ee727ae3ad403dbefd86572a681.tar drakx-backup-do-not-use-ce983934eee38ee727ae3ad403dbefd86572a681.tar.gz drakx-backup-do-not-use-ce983934eee38ee727ae3ad403dbefd86572a681.tar.bz2 drakx-backup-do-not-use-ce983934eee38ee727ae3ad403dbefd86572a681.tar.xz drakx-backup-do-not-use-ce983934eee38ee727ae3ad403dbefd86572a681.zip | |
fix buttons order under KDE when using compiz (by detecting kde-window-decorator, backport from trunk)
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/ugtk2.pm | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 679bf56d2..96680b6fd 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -2,6 +2,7 @@ o do propose "Suisse" after selecting french language (#34675) - draksec: o fix switching from "no_password" to "_password" (#34490) +- fix buttons order under KDE when using compiz (by detecting kde-window-decorator) Version 10.4.239 - 5 October 2007, by Thierry Vignaud 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), |