make sure that the color picker dialogs have the right parent

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8918 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 8f373cedf14417e812fac463db5a41f43496b44f..ec8ba665a817528eec4cc674c28e51daaa538aa4 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-14  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+       * QPrefsDialog.C (change_color): 
+       * QDocumentDialog.C (toggleBranchColor): set the parent of the
+       color picker correctly.
+
 2004-08-13  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * QLPopupMenu.C (fire): make Qt process events before we

diff --git a/src/frontends/qt2/QDocumentDialog.C b/src/frontends/qt2/QDocumentDialog.C
index 006d06b1a98672962052348445d14e846dd17370..9d8cb50f6a67021bef2949d6b27179cde5b214aa 100644 (file)
--- a/src/frontends/qt2/QDocumentDialog.C
+++ b/src/frontends/qt2/QDocumentDialog.C
@@ -533,7 +533,7 @@ void QDocumentDialog::toggleBranchColor()
                string x11hexname = branch->getColor();
                if (x11hexname[0] == '#')
                        initial.setNamedColor(toqstr(x11hexname));
-               QColor ncol(QColorDialog::getColor(initial));
+               QColor ncol(QColorDialog::getColor(initial, qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget()));
                if (ncol.isValid()){
                        // add the color to the branchlist
                        branch->setColor(fromqstr(ncol.name()));

diff --git a/src/frontends/qt2/QPrefsDialog.C b/src/frontends/qt2/QPrefsDialog.C
index 50fae356d951c27464018726cd12abf8650ed9f2..51a491ceb6c99a189f2284f7b6c78a61e3a64aa0 100644 (file)
--- a/src/frontends/qt2/QPrefsDialog.C
+++ b/src/frontends/qt2/QPrefsDialog.C
@@ -442,7 +442,7 @@ void QPrefsDialog::change_color()
                return;
        QListBoxItem * ib(lb->item(lb->currentItem()));
        QColorItem * ci(static_cast<QColorItem*>(ib));
-       QColor c(QColorDialog::getColor(ci->color()));
+       QColor c(QColorDialog::getColor(ci->color(), qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget()));
        if (c.isValid()) {
                ci->color(c);
                lb->update();