Fix bug #6096.

We used to need a hack to set the size of the layout combo, but
the code was changed in Qt 4.5 or so. Hence the appearance of this
bug in 2009. We can now just remove this hack, and all seems to
work correctly.

(cherry picked from commit d7f4346a19b69ae4f46ceba40b9e3a9744bb33f6)

diff --git a/src/frontends/qt4/LayoutBox.cpp b/src/frontends/qt4/LayoutBox.cpp
index 85df1694b813e2a91cb4698d5502f50c4fb83854..5ed7f2fa1aa8085675240be3edac69fb58eee70d 100644 (file)
--- a/src/frontends/qt4/LayoutBox.cpp
+++ b/src/frontends/qt4/LayoutBox.cpp
@@ -118,7 +118,7 @@ public:
                filterModel_(new GuiLayoutFilterModel(p)),
                lastSel_(-1),
                layoutItemDelegate_(new LayoutItemDelegate(parent)),
-               visibleCategories_(0), inShowPopup_(false)
+               visibleCategories_(0)
        {
                filterModel_->setSourceModel(model_);
        }
@@ -149,8 +149,6 @@ public:
        LayoutItemDelegate * layoutItemDelegate_;
        ///
        unsigned visibleCategories_;
-       ///
-       bool inShowPopup_;
 };
 
 
@@ -243,25 +241,6 @@ QSize LayoutItemDelegate::sizeHint(QStyleOptionViewItem const & opt,
                static_cast<QSortFilterProxyModel const *>(index.model());
        QSize size = QItemDelegate::sizeHint(opt, index);
 
-       /// QComboBox uses the first row height to estimate the
-       /// complete popup height during QComboBox::showPopup().
-       /// To avoid scrolling we have to sneak in space for the headers.
-       /// So we tweak this value accordingly. It's not nice, but the
-       /// only possible way it seems.
-       if (lyxrc.group_layouts && index.row() == 0 && layout_->d->inShowPopup_) {
-               int itemHeight = size.height();
-
-               // we have to show \c cats many headers:
-               unsigned cats = layout_->d->visibleCategories_;
-
-               // and we have \c n items to distribute the needed space over
-               unsigned n = layout_->model()->rowCount();
-
-               // so the needed average height (rounded upwards) is:
-               size.setHeight((headerHeight(opt) * cats + itemHeight * n + n - 1) / n);
-               return size;
-       }
-
        // Add space for the category headers here?
        // Not for the standard layout though.
        QString stdCat = category(*model->sourceModel(), 0);
@@ -378,23 +357,8 @@ void LayoutBox::Private::setFilter(QString const & s)
                        p->setCurrentIndex(i.row());
        }
 
-       // Workaround to resize to content size
-       // FIXME: There must be a better way. The QComboBox::AdjustToContents)
-       //        does not help.
        if (p->view()->isVisible()) {
-               // call QComboBox::showPopup. But set the inShowPopup_ flag to switch on
-               // the hack in the item delegate to make space for the headers.
-               // We do not call our implementation of showPopup because that
-               // would reset the filter again. This is only needed if the user clicks
-               // on the QComboBox.
-               LATTEST(!inShowPopup_);
-               inShowPopup_ = true;
                p->QComboBox::showPopup();
-               inShowPopup_ = false;
-
-               // The item delegate hack is off again. So trigger a relayout of the popup.
-               filterModel_->triggerLayoutChange();
-
                if (!s.isEmpty())
                        owner_.message(bformat(_("Filtering layouts with \"%1$s\". "
                                                 "Press ESC to remove filter."),
@@ -462,15 +426,7 @@ void LayoutBox::showPopup()
 
        d->resetFilter();
 
-       // call QComboBox::showPopup. But set the inShowPopup_ flag to switch on
-       // the hack in the item delegate to make space for the headers.
-       LATTEST(!d->inShowPopup_);
-       d->inShowPopup_ = true;
        QComboBox::showPopup();
-       d->inShowPopup_ = false;
-
-       // The item delegate hack is off again. So trigger a relayout of the popup.
-       d->filterModel_->triggerLayoutChange();
 
        view()->setUpdatesEnabled(enabled);
 }

diff --git a/status.23x b/status.23x
index 37a69efc7d1e07d2660b343926bd3d9ac18fcd3f..e83d551a188de46d528ab09072061b982acfdf93 100644 (file)
--- a/status.23x
+++ b/status.23x
@@ -95,6 +95,8 @@ What's new
 
 - Fix problem with undo of document settings (bug 9004).
 
+- Fix size of layout combo (bug 6096).
+
 
 * INTERNALS