From: Jon K. <em...@us...> - 2004-08-24 17:33:18
|
Update of /cvsroot/licq/qt-gui/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16993 Modified Files: userbox.cpp Log Message: Reverse horizontal bar commit, this caused a problem (bug #1010710) Get rid of the group icon item being set for a user after something was dropped onto him (bug #967862) Index: userbox.cpp =================================================================== RCS file: /cvsroot/licq/qt-gui/src/userbox.cpp,v retrieving revision 1.157 retrieving revision 1.158 diff -u -d -r1.157 -r1.158 --- userbox.cpp 11 Aug 2004 15:09:11 -0000 1.157 +++ userbox.cpp 24 Aug 2004 17:33:04 -0000 1.158 @@ -826,7 +826,7 @@ for (unsigned short i = 0; i < gMainWindow->colInfo.size(); i++) { - addColumn(gMainWindow->colInfo[i]->m_sTitle, -1);//gMainWindow->colInfo[i]->m_nWidth); + addColumn(gMainWindow->colInfo[i]->m_sTitle, gMainWindow->colInfo[i]->m_nWidth); setColumnAlignment(i + 1, 1 << gMainWindow->colInfo[i]->m_nAlign); } @@ -1248,7 +1248,7 @@ unsigned short totalWidth = 0; unsigned short nNumCols = header()->count(); - for (unsigned short i = 0; i < nNumCols; i++) + for (unsigned short i = 0; i < nNumCols - 1; i++) totalWidth += columnWidth(i); //QScrollBar *s = verticalScrollBar(); @@ -1257,10 +1257,12 @@ if (newWidth <= 0) { setHScrollBarMode(Auto); + setColumnWidth(nNumCols - 1, gMainWindow->colInfo[nNumCols - 2]->m_nWidth); } else { setHScrollBarMode(AlwaysOff); + setColumnWidth(nNumCols - 1, newWidth); } } @@ -1402,7 +1404,8 @@ gMainWindow->m_nGroupStates |= 1<<it->GroupId(); - if(!gMainWindow->pmExpanded.isNull()) i->setPixmap(0, gMainWindow->pmExpanded); + if(!gMainWindow->pmExpanded.isNull() && it->isGroupItem()) + i->setPixmap(0, gMainWindow->pmExpanded); } void CUserView::itemCollapsed(QListViewItem* i) @@ -1412,7 +1415,8 @@ gMainWindow->m_nGroupStates &= ~(1<<it->GroupId()); - if(!gMainWindow->pmCollapsed.isNull()) i->setPixmap(0, gMainWindow->pmCollapsed); + if(!gMainWindow->pmCollapsed.isNull() && it->isGroupItem()) + i->setPixmap(0, gMainWindow->pmCollapsed); } // ----------------------------------------------------------------------------- |