Author: tgoettlicher Date: Tue Feb 22 17:31:20 2011 New Revision: 63459

URL: http://svn.opensuse.org/viewcvs/yast?rev=63459&view=rev Log:

fixed bnc #650907: yast2 shrinks module selector item on search clean-up

Removed: trunk/control-center/src/modulesview.cpp trunk/control-center/src/modulesview.h Modified: trunk/control-center/VERSION.cmake trunk/control-center/package/yast2-control-center.changes trunk/control-center/src/kcategorizedview.cpp trunk/control-center/src/moduleiconitem.cpp

Modified: trunk/control-center/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/VERSION.cmake?rev=... ============================================================================== --- trunk/control-center/VERSION.cmake (original) +++ trunk/control-center/VERSION.cmake Tue Feb 22 17:31:20 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "20") -SET(VERSION_PATCH "0") +SET(VERSION_PATCH "1")

Modified: trunk/control-center/package/yast2-control-center.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/package/yast2-cont... ============================================================================== --- trunk/control-center/package/yast2-control-center.changes (original) +++ trunk/control-center/package/yast2-control-center.changes Tue Feb 22 17:31:20 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 22 17:36:58 CET 2011 - tgoettlicher@suse.de + +- fixed bnc #650907: yast2 shrinks module selector item on search +- 2.20.1 + +------------------------------------------------------------------- Tue Feb 22 14:20:36 CET 2011 - tgoettlicher@suse.de

- bnc #661109: Layout of icons gets mixed after using search

Modified: trunk/control-center/src/kcategorizedview.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/kcategorizedvi... ============================================================================== --- trunk/control-center/src/kcategorizedview.cpp (original) +++ trunk/control-center/src/kcategorizedview.cpp Tue Feb 22 17:31:20 2011 @@ -27,6 +27,7 @@ #include <QScrollBar> #include <QPaintEvent> #include <QDebug> +#include <iostream>

#include "kcategorydrawer.h" @@ -174,10 +175,12 @@ int itemWidthPlusSeparation = listView->spacing() + itemWidth; if (!itemWidthPlusSeparation) itemWidthPlusSeparation++; + int elementsPerRow = viewportWidth / itemWidthPlusSeparation; if (!elementsPerRow) elementsPerRow++;

+ int column; int row;

Modified: trunk/control-center/src/moduleiconitem.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/moduleiconitem... ============================================================================== --- trunk/control-center/src/moduleiconitem.cpp (original) +++ trunk/control-center/src/moduleiconitem.cpp Tue Feb 22 17:31:20 2011 @@ -20,8 +20,6 @@ */

#include "moduleiconitem.h" -//#include <kiconloader.h> -//#include <kdebug.h> #include "kcmoduleinfo.h"

#include <climits> @@ -88,9 +86,6 @@ } painter->setFont( f ); -// if( index.data( Qt::UserRole ).toInt() == KIconLoader::DisabledState ) { -// painter->setPen( option.palette.color( QPalette::Disabled, QPalette::Text ) ); -// }

QIcon::Mode iconMode = QIcon::Normal; if (selected) iconMode = QIcon::Selected; @@ -114,8 +109,8 @@ QFontMetrics fm( f );

QSize s = QItemDelegate::sizeHint( option, index ); - int w = lviewstyle->pixelMetric( QStyle::PM_FocusFrameHMargin ) + 2*lviewstyle->pixelMetric( QStyle::PM_ListViewIconSize ) + - + fm.boundingRect( text ).width(); + int w = 2*lviewstyle->pixelMetric( QStyle::PM_FocusFrameHMargin ) + 2*lviewstyle->pixelMetric( QStyle::PM_ListViewIconSize ) + 8 + fm.boundingRect( text ).width(); + return QSize( w, s.height()); }

@@ -137,42 +132,4 @@ return path; }

-/*ModuleIconItem::ModuleIconItem( QListWidget* parent, const KCModuleInfo& module) - :// QListWidgetItem(SmallIcon( module.icon(), IMAGE_SIZE ), module.moduleName(), parent), - imageName(module.icon()) -{ - - std::cout << "ModuleIconItem::ModuleIconItem" << std::endl; -// setData( Qt::UserRole, KIconLoader::DefaultState ); - modules.append(module); - setSize(); -} - -ModuleIconItem::ModuleIconItem( QListWidget* parent, const QString &text, - const QString &_imageName ) - : //QListWidgetItem( SmallIcon( _imageName, IMAGE_SIZE ), text, parent ), - imageName(_imageName) -{ - std::cout << "ModuleIconItem::ModuleIconItem" << std::endl; -// setData( Qt::UserRole, KIconLoader::DefaultState ); - setSize(); -} - -void ModuleIconItem::loadIcon( bool enabled ) -{ - std::cout << "ModuleIconItem::loadIcon" << std::endl; -// int newState = enabled ? KIconLoader::DefaultState : KIconLoader::DisabledState; -// if( newState == data( Qt::UserRole ).toInt() ) - return; - -// setData( Qt::UserRole, newState ); -// setIcon( DesktopIcon( imageName, IMAGE_SIZE , newState ) ); -}

-void ModuleIconItem::setSize() -{ - QStyle *style = listWidget()->style(); - QFontMetrics fm(font()); - const QRect &rect = fm.boundingRect(0, 0, ICON_WIDTH, INT_MAX, Qt::TextWordWrap, text()); - setData(Qt::SizeHintRole, QSize(ICON_WIDTH, IMAGE_SIZE + style->pixelMetric(QStyle::PM_FocusFrameVMargin) + rect.height())); -}*/