fixed regressions

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@5045 90c681e8-e032-0410-971d-27865f9a5e38

1 files changed, 2 insertions, 18 deletions

diff --git a/src/plugins/Ui/skinned/listwidget.cpp b/src/plugins/Ui/skinned/listwidget.cpp
index 3c92355b7..7f549bf3d 100644
--- a/src/plugins/Ui/skinned/listwidget.cpp
+++ b/src/plugins/Ui/skinned/listwidget.cpp
@@ -56,7 +56,6 @@ ListWidget::ListWidget(QWidget *parent)
 
     m_header = new PlayListHeader(this);
     m_update = false;
-    m_resize = false;
     m_drop_index = INVALID_INDEX;
     m_scroll_direction = NONE;
     m_prev_y = 0;
@@ -73,7 +72,7 @@ ListWidget::ListWidget(QWidget *parent)
     connect(m_skin, SIGNAL(skinChanged()), SLOT(updateSkin()));
     connect(m_ui_settings, SIGNAL(repeatableTrackChanged(bool)), SLOT(updateRepeatIndicator()));
     connect(m_timer, SIGNAL(timeout()), SLOT(autoscroll()));
-    //connect(headerModel, SIGNAL(headerChanged()), SLOT(updateColumns()));
+    connect(m_header, SIGNAL(resizeColumnRequest()), SLOT(updateColumns()));
     SET_ACTION(ActionManager::PL_SHOW_HEADER, this, SLOT(readSettings()));
 }
 
@@ -248,9 +247,7 @@ void ListWidget::mousePressEvent(QMouseEvent *e)
 
 void ListWidget::resizeEvent(QResizeEvent *e)
 {
-    m_resize = true;
     m_header->setGeometry(0,0,width(), m_header->requiredHeight());
-    m_resize = false;
     m_row_count = (e->size().height() - (m_header->isVisibleTo(this) ? m_header->height() : 0)) / m_drawer.rowHeight();
     m_row_count = qMax(m_row_count, 0);
     updateList(PlayListModel::STRUCTURE);
@@ -321,9 +318,7 @@ void ListWidget::updateList(int flags)
 
         //song numbers width
         m_drawer.calculateNumberWidth(m_model->trackCount());
-        m_resize = true;
         m_header->setNumberWidth(m_drawer.numberWidth());
-        m_resize = false;
 
         items = m_model->mid(m_first, m_row_count);
 
@@ -391,18 +386,7 @@ void ListWidget::updateList(int flags)
 
 void ListWidget::updateColumns()
 {
-    if(m_resize) //do no update while resize event
-        return;
-
-    m_header->updateColumns();
-    m_header->hideSortIndicator();
-    QList<PlayListItem *> items = m_model->mid(m_first, m_row_count);
-    for(int i = 0; i < items.count(); ++i)
-    {
-        m_rows[i]->titles = items[i]->formattedTitles();
-        m_drawer.prepareRow(m_rows[i]);  //elide titles
-    }
-    update();
+    updateList(PlayListModel::METADATA);
 }
 
 void ListWidget::autoscroll()