From e16b61096dfaa0f848092571ee03c8cb111d3852 Mon Sep 17 00:00:00 2001 From: Abdelrazak Younes Date: Thu, 16 Mar 2006 11:23:23 +0000 Subject: [PATCH] Edwin Leuven * entries in the combobox in the toolbar are not legible * same for entries in the listview in the preferences dialog * the color is not updated after changing it (i always change the murky pink color of lyx's background to white) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13387 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/ChangeLog | 7 +++++++ src/frontends/qt4/QLToolbar.C | 7 +------ src/frontends/qt4/QPrefsDialog.C | 2 +- src/frontends/qt4/panelstack.C | 4 +++- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/frontends/qt4/ChangeLog b/src/frontends/qt4/ChangeLog index b2e8b443eb..02e4b11ae5 100644 --- a/src/frontends/qt4/ChangeLog +++ b/src/frontends/qt4/ChangeLog @@ -1,3 +1,10 @@ +2006-03-16 Edwin Leuven + + * entries in the combobox in the toolbar are not legible + * same for entries in the listview in the preferences dialog + * the color is not updated after changing it (i always change the + murky pink color of lyx's background to white) + 2006-03-16 Abdelrazak Younes * fixed inset button grey colors. diff --git a/src/frontends/qt4/QLToolbar.C b/src/frontends/qt4/QLToolbar.C index fd9c3ea44f..fd5a416be0 100644 --- a/src/frontends/qt4/QLToolbar.C +++ b/src/frontends/qt4/QLToolbar.C @@ -80,16 +80,11 @@ Qt::ToolBarArea getToolBarPosition(ToolbarBackend::Flags const & flags) QLayoutBox::QLayoutBox(QToolBar * toolbar, QtView & owner) : owner_(owner) { - QSizePolicy p(QSizePolicy::Minimum, QSizePolicy::Fixed); combo_ = new QComboBox; - combo_->setSizePolicy(p); + combo_->setSizeAdjustPolicy(QComboBox::AdjustToContents); combo_->setFocusPolicy(Qt::ClickFocus); combo_->setMinimumWidth(combo_->sizeHint().width()); - // QAction * action = new QAction(combo_, tr("Layout"), this); -// action->setToolTip(toqstr(tooltip)); -// action->setStatusTip(toqstr(tooltip)); - QObject::connect(combo_, SIGNAL(activated(const QString &)), this, SLOT(selected(const QString &))); diff --git a/src/frontends/qt4/QPrefsDialog.C b/src/frontends/qt4/QPrefsDialog.C index 3641b30b6d..cbe5768eca 100644 --- a/src/frontends/qt4/QPrefsDialog.C +++ b/src/frontends/qt4/QPrefsDialog.C @@ -895,7 +895,7 @@ void QPrefsDialog::change_color() QColor c(QColorDialog::getColor(ci->color(), qApp->focusWidget() ? qApp->focusWidget() : qApp->mainWidget())); if (c.isValid()) { ci->color(c); - lb->update(); + lb->triggerUpdate(false); change_adaptor(); } } diff --git a/src/frontends/qt4/panelstack.C b/src/frontends/qt4/panelstack.C index 5a7fdc0f68..97aeba909c 100644 --- a/src/frontends/qt4/panelstack.C +++ b/src/frontends/qt4/panelstack.C @@ -80,7 +80,9 @@ void PanelStack::addCategory(string const & n, string const & parent) //it->second->addChild(item); } - panel_map_[n] = item; + panel_map_[n] = item; + + list_->setFixedWidth(list_->sizeHint().width()); /* item->setFlags(false); item->setOpen(true); -- 2.39.2