[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/libkonq
From:       Martin Koller <m.koller () surfeu ! at>
Date:       2005-01-07 19:36:16
Message-ID: 20050107193616.50D571B869 () office ! kde ! org
[Download RAW message or body]

CVS commit by mkoller: 

automatic default icon text width based on the selected font.
spacing() based on font().
leaveEvent to ensure a pending filetip is stopped.


  M +1 -1      konq_defaults.h   1.30
  M +11 -1     konq_iconviewwidget.cc   1.312
  M +2 -1      konq_iconviewwidget.h   1.119
  M +4 -0      konq_settings.cc   1.56


--- kdebase/libkonq/konq_defaults.h  #1.29:1.30
@@ -27,5 +27,5 @@
 #define DEFAULT_WORDWRAPTEXT true // kfm-like, sorry Reggie :-)
 #define DEFAULT_TEXTHEIGHT 2
-#define DEFAULT_TEXTWIDTH 70
+#define DEFAULT_TEXTWIDTH 0       // 0 = automatic (font depending)
 #define DEFAULT_TEXTWIDTH_MULTICOLUMN 600  // maxwidth, as the iconview has dynamic \
column width  #define DEFAULT_FILESIZEINBYTES false

--- kdebase/libkonq/konq_iconviewwidget.cc  #1.311:1.312
@@ -638,5 +638,7 @@ void KonqIconViewWidget::setIcons( int s
     {
         int realSize = size ? size : KGlobal::iconLoader()->currentSize( \
                KIcon::Desktop );
-        setSpacing( ( m_bDesktop || ( realSize > KIcon::SizeSmall ) ) ? 5 : 0 );
+        // choose spacing depending on font, but min 5 (due to KFileIVI  move limit)
+        setSpacing( ( m_bDesktop || ( realSize > KIcon::SizeSmall ) ) ?
+                    QMAX( 5, QFontMetrics(font()).width('n') ) : 0 );
     }
 
@@ -1306,4 +1308,12 @@ void KonqIconViewWidget::wheelEvent(QWhe
 }
 
+void KonqIconViewWidget::leaveEvent( QEvent *e )
+{
+    // when leaving the widget, stop possible pending filetip
+    d->pFileTip->setItem( 0 );
+
+    KIconView::leaveEvent(e);
+}
+
 void KonqIconViewWidget::mousePressChangeValue()
 {

--- kdebase/libkonq/konq_iconviewwidget.h  #1.118:1.119
@@ -56,5 +56,4 @@ public:
     /**
      * Constructor
-     * @param settings An instance of KonqFMSettings, see static methods in \
                konq_settings.h
      */
     KonqIconViewWidget( QWidget *parent = 0L, const char *name = 0L, WFlags f = 0, \
bool kdesktop = FALSE ); @@ -319,4 +318,6 @@ protected:
     virtual void backgroundPixmapChange( const QPixmap & );
     virtual void wheelEvent( QWheelEvent* );
+    virtual void leaveEvent( QEvent *e );
+
     void readAnimatedIconsConfig();
     void mousePressChangeValue();

--- kdebase/libkonq/konq_settings.cc  #1.55:1.56
@@ -26,4 +26,5 @@
 #include <kdebug.h>
 #include <assert.h>
+#include <qfontmetrics.h>
 
 struct KonqFMSettingsPrivate
@@ -89,4 +90,7 @@ void KonqFMSettings::init( KConfig * con
   
   d->m_iconTextWidth = config->readNumEntry( "TextWidth", DEFAULT_TEXTWIDTH );
+  if ( d->m_iconTextWidth == DEFAULT_TEXTWIDTH )
+    d->m_iconTextWidth = QFontMetrics(m_standardFont).width("0000000000");
+
   m_iconTextHeight = config->readNumEntry( "TextHeight", 0 );
   if ( m_iconTextHeight == 0 ) {


[prev in list] [next in list] [prev in thread] [next in thread]