From 3f9e3449d5ef1317506863ac4f593d88e245c1f9 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Fri, 13 Aug 2004 23:29:02 +0000 Subject: [PATCH] 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 --- src/frontends/qt2/ChangeLog | 6 ++++++ src/frontends/qt2/QDocumentDialog.C | 2 +- src/frontends/qt2/QPrefsDialog.C | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 8f373cedf1..ec8ba665a8 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,9 @@ +2004-08-14 Jean-Marc Lasgouttes + + * QPrefsDialog.C (change_color): + * QDocumentDialog.C (toggleBranchColor): set the parent of the + color picker correctly. + 2004-08-13 Jean-Marc Lasgouttes * QLPopupMenu.C (fire): make Qt process events before we diff --git a/src/frontends/qt2/QDocumentDialog.C b/src/frontends/qt2/QDocumentDialog.C index 006d06b1a9..9d8cb50f6a 100644 --- 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 50fae356d9..51a491ceb6 100644 --- 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(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(); -- 2.39.2