1 files changed, 2 insertions, 2 deletions

diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index 30afe64..0ced256 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -186,129 +186,129 @@ public:
         painter.setPen( colorGroup().background().light(105) );
         painter.drawLine( 0, i*3+2, width()-1, i*3+2 );
     }
       }
       p->drawTiledPixmap( r, *bg, QPoint( (r.x() + contentsX()) % bg->width(),
             (r.y() + contentsY()) % bg->height() ) );
   } else {
       p->fillRect( r, QBrush( colorGroup().background().light(110) ) );
   }
     }
 
     void hideOrShowItems(bool resort);
 
     void setTypeFilter(const QString& typefilter, bool resort)
     {
   tf = QRegExp(typefilter,FALSE,TRUE);
   hideOrShowItems(resort);
     }
 
     void setCategoryFilter( int catfilter, bool resort )
     {
   Categories cat;
   cat.load( categoryFileName() );
   QString str;
   if ( catfilter == -2 )
       cf = 0;
   else
       cf = catfilter;
   hideOrShowItems(resort);
     }
 
     enum SortMethod { Name, Date, Type };
 
     void setSortMethod( SortMethod m )
     {
   if ( sortmeth != m ) {
       sortmeth = m;
       sort();
   }
     }
 
     int compare(const AppLnk* a, const AppLnk* b)
     {
   switch (sortmeth) {
   case Name:
       return a->name().compare(b->name());
   case Date: {
       QFileInfo fa(a->linkFileKnown() ? a->linkFile() : a->file());
       QFileInfo fb(b->linkFileKnown() ? b->linkFile() : b->file());
       return fa.lastModified().secsTo(fb.lastModified());
   }
   case Type:
       return a->type().compare(b->type());
   }
   return 0;
     }
 
 protected:
 
     void styleChange( QStyle &old )
     {
   QIconView::styleChange( old );
   //### duplicated code from LauncherView constructor
   int dw = QApplication::desktop()->width();
-  setGridX( (dw-13-style().scrollBarExtent().width())/3 ); // tweaked for 8pt+dw=176 and 10pt+dw=240
+  setGridX( (dw-13-style().scrollBarExtent().width())/ (dw/80) ); // tweaked for 8pt+dw=176 and 10pt+dw=240
     }
 
 private:
     QList<AppLnk> hidden;
     QDict<void> mimes;
     QDict<void> cats;
     SortMethod sortmeth;
     QRegExp tf;
     int cf;
     QIconViewItem* bsy;
     bool ike;
 
 };
 
 
 bool LauncherView::bsy=FALSE;
 
 void LauncherView::setBusy(bool on)
 {
     icons->setBusy(on);
 }
 
 class LauncherItem : public QIconViewItem
 {
 public:
     LauncherItem( QIconView *parent, AppLnk* applnk );
     ~LauncherItem()
     {
   LauncherIconView* liv = (LauncherIconView*)iconView();
   if ( liv->busyItem() == this )
       liv->setBusy(FALSE);
   delete app;
     }
 
     AppLnk* appLnk() const { return app; }
     AppLnk* takeAppLnk() { AppLnk* r=app; app=0; return r; }
 
     virtual int compare ( QIconViewItem * i ) const;
 
     void paintItem( QPainter *p, const QColorGroup &cg )
     {
   LauncherIconView* liv = (LauncherIconView*)iconView();
   QBrush oldBrush( liv->itemTextBackground() );
   QColorGroup mycg( cg );
   if ( liv->currentItem() == this ) {
       liv->setItemTextBackground( cg.brush( QColorGroup::Highlight ) );
       mycg.setColor( QColorGroup::Text, cg.color( QColorGroup::HighlightedText ) );
   }
   else {
       mycg.setColor( QColorGroup::Text, liv->iconText );
   }
 
   QIconViewItem::paintItem(p,mycg);
   if ( liv->currentItem() == this )
       liv->setItemTextBackground( oldBrush );
   if ( liv->busyItem() == this ) {
       static QPixmap* busypm=0;
       if ( !busypm )
     busypm = new QPixmap(Resource::loadPixmap("launching"));
       p->drawPixmap(x()+(width()-busypm->width())/2, y(),*busypm);
   }
     }
 
 protected:
@@ -371,129 +371,129 @@ void LauncherIconView::updateCategoriesAndMimeTypes()
     }
 }
 
 void LauncherIconView::hideOrShowItems(bool resort)
 {
     hidden.setAutoDelete(FALSE);
     QList<AppLnk> links=hidden;
     hidden.clear();
     hidden.setAutoDelete(TRUE);
     LauncherItem* item = (LauncherItem*)firstItem();
     while (item) {
   links.append(item->takeAppLnk());
   item = (LauncherItem*)item->nextItem();
     }
     bool oldAutoArrange = autoArrange();
     setAutoArrange( FALSE );
     clear();
     QListIterator<AppLnk> it(links);
     AppLnk* l;
     while ((l=it.current())) {
   addItem(l,FALSE);
   ++it;
     }
     if ( resort )
   sort();
     setAutoArrange( oldAutoArrange );
 }
 
 bool LauncherIconView::removeLink(const QString& linkfile)
 {
     LauncherItem* item = (LauncherItem*)firstItem();
     AppLnk* l;
     bool did = FALSE;
     DocLnk dl(linkfile);
     while (item) {
   l = item->appLnk();
   if (  l->linkFileKnown() && l->linkFile() == linkfile/* || l->file() == linkfile || dl.isValid() && dl.file() == l->file()*/ ) {
       delete item;
       did = TRUE;
   }
   item = (LauncherItem*)item->nextItem();
     }
     QListIterator<AppLnk> it(hidden);
     while ((l=it.current())) {
   ++it;
   if ( l->linkFileKnown() && l->linkFile() == linkfile/* || l->file() == linkfile || dl.isValid() && dl.file() == l->file()*/ ) {
       hidden.removeRef(l);
      did = TRUE;
   }
     }
     return did;
 }
 
 LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl )
     : QVBox( parent, name, fl )
 {
     icons = new LauncherIconView( this );
     setFocusProxy(icons);
     QPEApplication::setStylusOperation( icons->viewport(), QPEApplication::RightOnHold );
 
     int dw = QApplication::desktop()->width();
     icons->setItemsMovable( FALSE );
     icons->setAutoArrange( TRUE );
     icons->setSorting( TRUE );
-    icons->setGridX( (dw-13-style().scrollBarExtent().width())/3 ); // tweaked for 8pt+dw=176 and 10pt+dw=240
+    icons->setGridX( (dw-13-style().scrollBarExtent().width())/ (dw/80) ); // tweaked for 8pt+dw=176 and 10pt+dw=240
     icons->setGridY( fontMetrics().height()*2+24 );
     icons->setFrameStyle( QFrame::NoFrame );
     icons->setSpacing( 4 );
     icons->setMargin( 0 );
     icons->setSelectionMode( QIconView::Multi );
     icons->setBackgroundMode( PaletteBase );
 
     connect( icons, SIGNAL(mouseButtonClicked(int, QIconViewItem *, const QPoint&)),
        SLOT(itemClicked(int, QIconViewItem *)) );
     connect( icons, SIGNAL(selectionChanged()),
        SLOT(selectionChanged()) );
     connect( icons, SIGNAL(returnPressed(QIconViewItem *)),
        SLOT(returnPressed(QIconViewItem *)) );
     connect( icons, SIGNAL(mouseButtonPressed(int, QIconViewItem *, const QPoint&)),
        SLOT(itemPressed(int, QIconViewItem *)) );
 
     tools = 0;
 }
 
 LauncherView::~LauncherView()
 {
 }
 
 void LauncherView::setToolsEnabled(bool y)
 {
     if ( !y != !tools ) {
   if ( y ) {
       tools = new QHBox(this);
 
       // Type filter
       typemb = new MenuButton(tools);
       typemb->setLabel(tr("Type: %1"));
       typemb->setFixedHeight ( 20 );
           
       // Category filter
       catmb = new CategorySelect(tools);
       catmb->setFixedHeight ( 20 );
       
       updateTools();
       tools->show();
   } else {
       delete tools;
       tools = 0;
   }
     }
 }
 
 void LauncherView::updateTools()
 {
     disconnect( typemb, SIGNAL(selected(const QString&)),
           this, SLOT(showType(const QString&)) );
     disconnect( catmb, SIGNAL(signalSelected(int)),
           this, SLOT(showCategory(int)) );
 
     icons->updateCategoriesAndMimeTypes();
 
     QString prev;
 
     // Type filter
     QStringList types;
     types << tr("All");
     types << "--";
     types += icons->mimeTypes();
     prev = typemb->currentText();